Fixed channel listing, support for read only channels

titanembeds/blueprints/api/api.py

@@ -107,30 +107,84 @@ def format_post_content(message):
 @cache.cached(timeout=300, key_prefix=make_guildchannels_cache_key)
 def get_guild_channels(guild_id):
     if user_unauthenticated():
-        roles = [guild_id] #equivilant to @everyone role
+        member_roles = [guild_id] #equivilant to @everyone role
     else:
         member = discord_api.get_guild_member(guild_id, session['user_id'])['content']
-        roles = member['roles']
+        member_roles = member['roles']
     guild_channels = discord_api.get_guild_channels(guild_id)['content']
+    guild_roles = discord_api.get_guild_roles(guild_id)["content"]
     guild_owner = discord_api.get_guild(guild_id)['content']['owner_id']
     result_channels = []
     for channel in guild_channels:
         if channel['type'] == 0:
+            result = {"channel": channel, "read": False, "write": False}
             if guild_owner == session['user_id']:
-                result_channels.append(channel)
+                result["read"] = True
+                result["write"] = True
+                result_channels.append(result)
                 continue
-            if len(channel['permission_overwrites']) == 0:
+            channel_perm = 0
-                result_channels.append(channel)
+
-            else:
+            # @everyone
-                for overwrite in channel['permission_overwrites']:
+            for role in guild_roles:
-                    if overwrite['type'] == "role" and overwrite['id'] == roles[-1] and not user_has_permission(overwrite['deny'], 10):
+                if role["id"] == guild_id:
-                        result_channels.append(channel)
+                    channel_perm |= role["permissions"]
-                        break
+                    continue
-                    elif overwrite['type'] == "member" and not user_unauthenticated and overwrite['id'] == session['user_id'] and not user_has_permission(overwrite['deny'], 10):
+
-                        result_channels.append(channel)
+            # User Guild Roles
-                        break
+            for m_role in member_roles:
+                for g_role in guild_roles:
+                    if g_role["id"] == m_role:
+                        channel_perm |= g_role["permissions"]
+                        continue
+
+            # If has server administrator permission
+            if user_has_permission(channel_perm, 3):
+                result["read"] = True
+                result["write"] = True
+                result_channels.append(result)
+                continue
+
+            denies = 0
+            allows = 0
+
+            # channel specific
+            for overwrite in channel["permission_overwrites"]:
+                if overwrite["type"] == "role" and overwrite["id"] in member_roles:
+                    denies |= overwrite["deny"]
+                    allows |= overwrite["allow"]
+
+            channel_perm = (channel_perm & ~denies) | allows
+
+            # member specific
+            for overwrite in channel["permission_overwrites"]:
+                if overwrite["type"] == "member" and overwrite["id"] == session["user_id"]:
+                    channel_perm = (channel_perm & ~overwrite['deny']) | overwrite['allow']
+                    break
+
+            result["read"] = user_has_permission(channel_perm, 10)
+            result["write"] = user_has_permission(channel_perm, 11)
+
+            # If default channel, you can read
+            if channel["id"] == guild_id:
+                result["read"] = True
+
+            # If you cant read channel, you cant write in it
+            if not user_has_permission(channel_perm, 10):
+                result["read"] = False
+                result["write"] = False
+
+            if result["read"]:
+                result_channels.append(result)
     return result_channels
 
+def filter_guild_channel(guild_id, channel_id):
+    channels = get_guild_channels(guild_id)
+    for chan in channels:
+        if chan["channel"]["id"] == guild_id:
+            return chan
+    return None
+
 def get_online_discord_users(guild_id):
     embed = discord_api.get_widget(guild_id)
     return embed['members']
@@ -170,12 +224,16 @@ def fetch():
     else:
         key = None
     status = update_user_status(guild_id, session['username'], key)
+    messages = {}
     if status['banned'] or status['revoked']:
-        messages = {}
         status_code = 403
     else:
-        messages = discord_api.get_channel_messages(channel_id, after_snowflake)
+        chan = filter_guild_channel(guild_id, channel_id)
-        status_code = messages['code']
+        if not chan.get("read"):
+            status_code = 401
+        else:
+            messages = discord_api.get_channel_messages(channel_id, after_snowflake)
+            status_code = messages['code']
     response = jsonify(messages=messages.get('content', messages), status=status)
     response.status_code = status_code
     return response
@@ -193,12 +251,16 @@ def post():
     else:
         key = None
     status = update_user_status(guild_id, session['username'], key)
+    message = {}
     if status['banned'] or status['revoked']:
-        message = {}
         status_code = 401
     else:
-        message = discord_api.create_message(channel_id, content)
+        chan = filter_guild_channel(guild_id, channel_id)
-        status_code = message['code']
+        if not chan.get("write"):
+            status_code = 401
+        else:
+            message = discord_api.create_message(channel_id, content)
+            status_code = message['code']
     response = jsonify(message=message.get('content', message), status=status)
     response.status_code = status_code
     return response

titanembeds/static/js/embed.js

@@ -144,8 +144,19 @@ function fill_channels(channels) {
     $("#channels-list").empty();
     for (var i = 0; i < channels.length; i++) {
         var chan = channels[i];
-        var rendered = Mustache.render(template, {"channelid": chan.id, "channelname": chan.name});
+        if (chan.read) {
-        $("#channels-list").append(rendered);
+          var rendered = Mustache.render(template, {"channelid": chan.channel.id, "channelname": chan.channel.name});
+          $("#channels-list").append(rendered);
+          if (chan.channel.id == selected_channel) {
+            if (chan.write) {
+              $("#messagebox").prop('disabled', false);
+              $("#messagebox").prop('placeholder', "Enter message");
+            } else {
+              $("#messagebox").prop('disabled', true);
+              $("#messagebox").prop('placeholder', "Messages is disabled in this channel.");
+            }
+          }
+        }
     }
     $("#channel-"+selected_channel).parent().addClass("active");
 }