diff --git a/tfbbridge/bridge/groupme.py b/tfbbridge/bridge/groupme.py new file mode 100644 index 0000000..e69de29 diff --git a/tfbbridge/bridge/templates/view_organization.html b/tfbbridge/bridge/templates/view_organization.html index ab2c607..2def1a3 100644 --- a/tfbbridge/bridge/templates/view_organization.html +++ b/tfbbridge/bridge/templates/view_organization.html @@ -34,7 +34,7 @@
Add new trusted channel - Add new follower channel + Add new follower channel View QR Code
diff --git a/tfbbridge/bridge/utils.py b/tfbbridge/bridge/utils.py new file mode 100644 index 0000000..d372df1 --- /dev/null +++ b/tfbbridge/bridge/utils.py @@ -0,0 +1,16 @@ +import pickle +from .models import Organization + +def to_pickle(data): + return pickle.dumps(data).hex() + +def from_pickle(data): + return pickle.loads(bytes.fromhex(data)) + +# remove duplicate users +# https://stackoverflow.com/questions/9427163/remove-duplicate-dict-in-list-in-python +def remove_dup_dict_in_list(l): + return [i for n, i in enumerate(l) if i not in l[n + 1:]] + +def get_org_by_id(org_id): + return Organization.objects.filter(id__exact=org_id)[0] diff --git a/tfbbridge/bridge/views.py b/tfbbridge/bridge/views.py index 248f13e..acef3fc 100644 --- a/tfbbridge/bridge/views.py +++ b/tfbbridge/bridge/views.py @@ -7,6 +7,7 @@ import pickle import qrcode import json import random +from .utils import to_pickle, from_pickle, remove_dup_dict_in_list, get_org_by_id bot_name = "tfbbot" auth_link = "https://oauth.groupme.com/oauth/authorize?client_id=KbStJZciPGivvLuTN9XX6aXf6NHVcxDSiVR0wRC0cqVDuDfG" @@ -15,10 +16,7 @@ def login(request): return redirect(auth_link) def add_organization_flow_select(request): - user_group_data = pickle.loads( - bytes.fromhex( - request.session["groupme_groups_pickle"] - )) + user_group_data = from_pickle(request.session["groupme_groups_pickle"]) user_group_data = user_group_data["response"] if request.method == "GET": rendered_groups = [] @@ -41,9 +39,7 @@ def add_organization_flow_select(request): break - # remove duplicate users - # https://stackoverflow.com/questions/9427163/remove-duplicate-dict-in-list-in-python - rendered_users = [i for n, i in enumerate(rendered_users) if i not in rendered_users[n + 1:]] + rendered_users = remove_dup_dict_in_list(rendered_users) # sort users by name rendered_users = sorted(rendered_users, key=lambda x: x["name"].lower()) @@ -61,10 +57,7 @@ def add_organization_flow_select(request): name = request.POST["name"] users = [i[2:] for i in request.POST.keys() if i.startswith("u_")] groups = [i[2:] for i in request.POST.keys() if i.startswith("g_")] - group_name_mapping = pickle.loads( - bytes.fromhex( - request.session["group_name_mapping"] - )) + group_name_mapping = from_pickle(request.session["group_name_mapping"]) org = Organization() org.owner = request.session["groupme_id"] @@ -105,7 +98,7 @@ def add_organization_flow_select(request): group_data_collected.append(group_data) user_data_collected = [] - user_name_mappings = pickle.loads(bytes.fromhex(request.session["user_name_mapping"])) + user_name_mappings = from_pickle(request.session["user_name_mapping"]) for user in users: try: username = user_name_mappings[user] @@ -114,8 +107,8 @@ def add_organization_flow_select(request): user_data = { "uid": user, "role": "trusted", "name": username, "number_messages": 0 } user_data_collected.append(user_data) - org.trusted_users = pickle.dumps(user_data_collected).hex() - org.channel_info = pickle.dumps(group_data_collected).hex() + org.trusted_users = to_pickle(user_data_collected) + org.channel_info = to_pickle(group_data_collected) org.save() return redirect(reverse("view_organization", kwargs={"org_id": org.id})) @@ -135,20 +128,20 @@ def handle_oauth(request): request.session["groupme_access_token"] )) - request.session["groupme_groups_pickle"] = pickle.dumps(r.json()).hex() + request.session["groupme_groups_pickle"] = to_pickle(r.json()) request.session["logged_in"] = "yes" group_name_mapping = {} for group in r.json()["response"]: group_name_mapping[group["id"]] = group["name"] - request.session["group_name_mapping"] = pickle.dumps(group_name_mapping).hex() + request.session["group_name_mapping"] = to_pickle(group_name_mapping) user_name_mapping = {} for group in r.json()["response"]: for user in group["members"]: user_name_mapping[user["id"]] = user["name"] user_name_mapping[data["response"]["id"]] = data["response"]["name"] - request.session["user_name_mapping"] = pickle.dumps(user_name_mapping).hex() + request.session["user_name_mapping"] = to_pickle(user_name_mapping) try: if request.session["needs_redirect"]: @@ -186,13 +179,13 @@ def logout(request): return redirect(index) def view_organization(request, org_id): - org = Organization.objects.filter(id__exact=org_id)[0] + org = get_org_by_id(org_id) scheme = 'https' if request.is_secure() else 'http' hostname = request.get_host() if request.session["groupme_id"] == org.owner: - org_channel_info = pickle.loads(bytes.fromhex(org.channel_info)) - org_trusted_users = pickle.loads(bytes.fromhex(org.trusted_users)) + org_channel_info = from_pickle(org.channel_info) + org_trusted_users = from_pickle(org.trusted_users) return render(request, "view_organization.html", { "request": request, "org": org, @@ -205,7 +198,7 @@ def view_organization(request, org_id): pass # blow up def qr_code(request, org_id): - org = Organization.objects.filter(id__exact=org_id)[0] + org = get_org_by_id(org_id) scheme = 'https' if request.is_secure() else 'http' hostname = request.get_host() @@ -237,13 +230,10 @@ def add_channel_to_organization(request, org_id, trusted=False): request.session["needs_redirect"] = "add_channel_to_organization" return redirect(reverse("login")) - org = Organization.objects.filter(id__exact=org_id)[0] + org = get_org_by_id(org_id) if request.method == "GET": - user_group_data = pickle.loads( - bytes.fromhex( - request.session["groupme_groups_pickle"] - ))["response"] + user_group_data = from_pickle(request.session["groupme_groups_pickle"])["response"] our_id = request.session["groupme_id"] groups_we_admin = [] @@ -261,11 +251,8 @@ def add_channel_to_organization(request, org_id, trusted=False): }) elif request.method == "POST": - group_name_mapping = pickle.loads( - bytes.fromhex( - request.session["group_name_mapping"] - )) - org = Organization.objects.filter(id__exact=org_id)[0] + group_name_mapping = from_pickle(request.session["group_name_mapping"]) + org = get_org_by_id(org_id) groups = [i[2:] for i in request.POST.keys() if i.startswith("g_")] org_group_info = pickle.loads(bytes.fromhex(org.channel_info)) @@ -311,7 +298,6 @@ def add_channel_to_organization(request, org_id, trusted=False): headers={"Content-Type": "application/json"}, ) - print(r) data = r.json() if not trusted: @@ -361,8 +347,8 @@ def delete_channel(request, org_id, chan): return redirect(reverse('view_organization', args=[org.id])) def demote_channel(request, org_id, chan): - org = Organization.objects.filter(id__exact=org_id)[0] - org_group_info = pickle.loads(bytes.fromhex(org.channel_info)) + org = get_org_by_id(org_id) + org_group_info = from_pickle(org.channel_info) for index, channel in enumerate(org_group_info): print(index, channel) @@ -370,18 +356,15 @@ def demote_channel(request, org_id, chan): org_group_info[index]["role"] = "following" break - org.channel_info = pickle.dumps(org_group_info).hex() + org.channel_info = to_pickle(org_group_info) org.save() return redirect(reverse('view_organization', args=[org.id])) def add_trusted_user(request, org_id): - org = Organization.objects.filter(id__exact=org_id)[0] - org_trusted_users = pickle.loads(bytes.fromhex(org.trusted_users)) - user_group_data = pickle.loads( - bytes.fromhex( - request.session["groupme_groups_pickle"] - )) + org = get_org_by_id(org_id) + org_trusted_users = from_pickle(org.trusted_users) + user_group_data = from_pickle(request.session["groupme_groups_pickle"]) user_group_data = user_group_data["response"] rendered_users = [] @@ -398,9 +381,7 @@ def add_trusted_user(request, org_id): break - # remove duplicate users - # https://stackoverflow.com/questions/9427163/remove-duplicate-dict-in-list-in-python - rendered_users = [i for n, i in enumerate(rendered_users) if i not in rendered_users[n + 1:]] + rendered_users = remove_dup_dict_in_list(rendered_users) if request.method == "GET": return render(request, "add_user.html", { @@ -427,8 +408,8 @@ def add_trusted_user(request, org_id): return redirect(reverse('view_organization', args=[org.id])) def remove_user(request, org_id, user): - org = Organization.objects.filter(id__exact=org_id)[0] - org_trusted_users = pickle.loads(bytes.fromhex(org.trusted_users)) + org = get_org_by_id(org_id) + org_trusted_users = from_pickle(org.trusted_users) for index, tuser in enumerate(org_trusted_users): print(index, tuser) @@ -437,7 +418,7 @@ def remove_user(request, org_id, user): org_trusted_users.pop(index) break - org.trusted_users = pickle.dumps(org_trusted_users).hex() + org.trusted_users = to_pickle(org_trusted_users) org.save() return redirect(reverse('view_organization', args=[org.id]))