Commit Graph

113 Commits

Author SHA1 Message Date
Adarnof
a6447d3596 Added link to discord server to services page.
Corrected handling of user deletion to return true if account absent on server.
2015-11-30 23:01:44 +00:00
Adarnof
34a27ba885 Added syncgroup logic to celery tasks.
Wrote request handles for enabling and disabling discord user.
2015-11-30 22:08:17 +00:00
Adarnof
c51b8c77e6 Consolidated API manager and service manager.
Initial service functions added to DiscordManager.
2015-11-30 21:47:06 +00:00
Adarnof
4383e9314d Corrected missing header for delete_invite 2015-11-30 04:00:31 +00:00
Adarnof
7e05054854 Initial work on Discord integration.
Manually created REST API manager as per the documented functions.
Attempting to integrade discord-py wrapper, unsuccesful thusfar.
Addresses #88
2015-11-30 03:44:38 +00:00
Adarnof
52eb5e0fd8 Removed commented code.
Addresses #104
2015-11-28 00:53:59 +00:00
Adarnof
0c1bf29dd3 Introduced new setting for broadcast service.
Changed broadcast logic to use broadcase openfire plugin.
Inital, untested commit.
2015-11-28 00:33:16 +00:00
Adarnof
20362625ea Corrected access mask logic to ensure required endpoints are available. 2015-11-27 00:18:00 +00:00
Adarnof
35277b7f33 Manual conflict resoltuion for pull request #98 2015-11-25 02:59:13 +00:00
Adarnof
f3d2a9cca5 Added logic to check if corp or alliance exists
Prevents errors in celery task from prevention execution
Addresses issues #68 and #93
2015-11-24 02:45:36 +00:00
Adarnof
b46365a3d3 Merge pull request #87 from Adarnof/forumavatars
phpbb3 avatars
2015-11-15 15:51:14 -05:00
Adarnof
810b626005 Corrected one last typo, I promise 2015-11-08 10:14:44 +00:00
Adarnof
5ab4ce2869 Yet another typo 2015-11-15 20:22:22 +00:00
Adarnof
ff46c1d4e9 Fixed broken function reference 2015-11-15 20:20:49 +00:00
Adarnof
1285fb6dfc Corrected SQL syntax 2015-11-15 20:19:52 +00:00
Adarnof
df487aa61e Corrected mismatched avatar sizes 2015-11-15 20:15:20 +00:00
Adarnof
0a24f3bad4 Enabled forum avatar images in phpbb set by main character id 2015-11-15 20:12:26 +00:00
Adarnof
3614c78971 Corrected indexoutofrange exception when handling certain serverqueries 2015-11-08 05:14:55 +00:00
Adarnof
1cc3b2a6b7 Fixed Issue #77 Teamspeak3 Manger errors prevent run_databaseUpdate from completing
Wrapped _sync_ts_group_db in a try/catch block until we abstract services into their own apps
2015-11-07 05:33:46 +00:00
Adarnof
b7327a34d0 Corrected reference to misnamed group. 2015-11-07 00:46:44 +00:00
Brett Costabile
15e959b265 Merged with R4stl1n master
Had to resolve a small conflict in email. Replaced mine with upstream.
2015-11-05 22:37:37 -05:00
Brett Costabile
c9958ebbb5 Removed all my logging
I'm done. Don't need this anymore.
2015-11-03 01:18:08 -05:00
Brett Costabile
c8d7ea2ca9 FUCKING MAPS AND LISTS
FUUUUUUUUUUUUUUUUUUUUUCK
2015-11-03 00:53:44 -05:00
Brett Costabile
b2eadc2a78 logging
yes more
2015-11-03 00:46:35 -05:00
Brett Costabile
adcbcdaf52 Casting int to str
because it's better than trying to compare them shithead
2015-11-03 00:41:37 -05:00
Brett Costabile
5a03565f86 So close
but no qute
2015-11-02 23:43:21 -05:00
Brett Costabile
e9a2cb54b1 Lists and maps
it's important to remember which one you're working with
2015-11-02 23:34:54 -05:00
Brett Costabile
876ac6f3a2 Strings and ints
I was comparing them. That was dumb
2015-11-02 23:30:00 -05:00
Brett Costabile
ba1e11d182 Can I stop yet? 2015-11-02 23:21:38 -05:00
Brett Costabile
bba5bc33c4 Logging
I'm tired
2015-11-02 23:16:59 -05:00
Brett Costabile
d7933f5311 Logging
Even more
2015-11-02 23:08:02 -05:00
Brett Costabile
9c0d980bfa logging
I broke it again
2015-11-02 22:46:26 -05:00
Brett Costabile
385533a9b5 filter
It's not plural
2015-11-02 22:15:24 -05:00
Brett Costabile
560673767a syntax
get some
2015-11-02 22:12:49 -05:00
Brett Costabile
d3d1463404 Version conflict
update_or_insert is from a newer version of django. gotta use .save()
2015-11-02 22:08:32 -05:00
Brett Costabile
425aef081d Add/Remove user need sting inputs
Had to cast groupid to str
2015-11-02 00:49:34 -05:00
Brett Costabile
8a0e3f309d More logging
Groups aren't adding now. Gotta make the logging better in
update_groups()
2015-11-02 00:41:31 -05:00
Brett Costabile
f0527a5479 mistake
forgot to change one instance of groupname to groupid
2015-11-02 00:23:12 -05:00
Brett Costabile
c81b676553 remove_user_from_group
Mirrored changes from add_user_from_group() remove_user_from_group()
2015-11-02 00:14:58 -05:00
Brett Costabile
6abd62960f Small error
If statement with bad syntax
2015-11-01 23:50:26 -05:00
Brett Costabile
7039cffddb Fixing Server Admin assignment
Changed _add_user_to_group() to take group ID instead of group name.
addgroups and remgroups are now lists instead of dictionaries because I
don't need the group names anymore.
Removed debug logging from _add_user_to_group() and send_command()
2015-11-01 23:40:34 -05:00
Brett Costabile
478d855d62 Logging
It looks like the escaping is fine, but there's two "Server Admin"
groups (id3 and id6) which might be messing with the assignment.
2015-11-01 18:19:56 -05:00
Brett Costabile
621de341a8 Logging
I think the issue may be with escaping the whitespace in group names. If
this is the case, I'll have to tweak the code in ts3.py
2015-11-01 18:06:35 -05:00
Brett Costabile
2eb0bd5221 More indentation
Notepad++ was configured to use tabs instead of spaces. That shouldn't
happen anymore.
2015-11-01 17:53:10 -05:00
Brett Costabile
ee3fe5e43e More logging
Added more debug logging to figure out why Server Admin never gets
assigned.
2015-11-01 17:49:53 -05:00
Brett Costabile
df659c4851 Copypaste error
user_ts_group_key should have been ts_group_key
2015-11-01 17:34:01 -05:00
Brett Costabile
94ef8ce694 Indentation
I broke it. Now it's fixed.
2015-11-01 17:32:08 -05:00
Brett Costabile
cddd2b91e4 changed group key type
Why did I even think long was a good idea?
2015-11-01 17:28:41 -05:00
Brett Costabile
2bfbd614e6 Adjusted logging
Changed logging to make a little more sense during debugging
2015-11-01 17:27:04 -05:00
Brett Costabile
b76bc2729c More random changes
Super disorganized here. Trying to get back to a working state
2015-11-01 16:41:16 -05:00