dan/discord.js
1
0
Fork 0
mirror of https://github.com/danbulant/discord.js synced 2026-05-27 05:52:05 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1201 commits 8 branches 50 tags 70 MiB
Commit graph

650 commits

Author SHA1 Message Date
Nicholas Tay
f591542735 Working friends support with events and requests 2016-03-30 21:01:48 +11:00
Nicholas Tay
77346e3415 Send guild_id on voice destroy for bot accounts to work 
(thanks qeled for supplying this fix, as per in the node_discord-js discord chat channel :D)
 2016-03-28 19:06:10 +11:00
Nicholas Tay
18dd59fe42 Fix bot detection on updateDetails 2016-03-28 19:04:44 +11:00
abalabahaha
74c06f7a69 Workaround for voice channel update member persistence 2016-03-20 00:32:17 -07:00
abalabahaha
99af4a7d66 Fixed bad wording 2016-03-20 00:05:19 -07:00
abalabahaha
28b7b9f5d6 Wrong variable name, logic fixes, forgot a !, allow neutral permission overwrite 2016-03-19 23:45:38 -07:00
abalabahaha
b069f818d9 Unoverlap allow when denying a permission overwrite 2016-03-19 22:54:49 -07:00
abalabahaha
95748f3721 Merge pull request #229 from brussell98/indev 
Added ability to use updateDetails() with token
 2016-03-19 22:44:05 -07:00
abalabahaha
3bbd4f46d2 Merge pull request #226 from petoem/indev 
Add ability to pause and resume audio thats being played
 2016-03-19 22:43:48 -07:00
Brandon Russell
93e3106404 Check if user or bot and require email for user 2016-03-20 00:19:29 -05:00
abalabahaha
703ac05400 User bot property 2016-03-19 22:11:11 -07:00
abalabahaha
afdb93b3d6 Let overwritePermissions keep existing permissions 2016-03-19 22:07:33 -07:00
abalabahaha
583906fe81 .find() isn't polyfilled apparently 2016-03-19 22:07:26 -07:00
Brandon Russell
72340845e5 Add email and password if non-token login 2016-03-19 23:14:28 -05:00
Brandon Russell
4386daf7a0 Added ability to use updateDetails() with token 2016-03-19 23:02:22 -05:00
Michael Petö
462adfbad3 Add ability to pause and resume audio thats being played 2016-03-19 21:54:25 +01:00
qeled
4d6cca72f4 Implement voice encryption support 2016-03-18 06:32:35 +03:00
abalabahaha
27a0361afc Not everyone needs to set the volume 2016-03-15 22:09:16 -07:00
abalabahaha
8614d4b2a5 Less CPU on cache update 2016-03-15 22:04:52 -07:00
abalabahaha
f0dd0cabdf 6.1.0 2016-03-15 22:04:52 -07:00
abalabahaha
e525e3b722 Copy paste fail 2016-03-15 22:04:52 -07:00
abalabahaha
42bedbeee4 Attempt to fix cache crash 2016-03-15 22:04:44 -07:00
abalabahaha
930f276828 Aaron copied horrible code from elsewhere 2016-03-12 22:06:30 -08:00
abalabahaha
13055f67d2 Attempted to understand volume code and retry fixes 2016-03-12 21:53:34 -08:00
abalabahaha
5e64d96272 Attempted assorted fixes 2016-03-12 21:44:07 -08:00
abalabahaha
25f25f5506 Attempt to process volume option 2016-03-12 21:27:48 -08:00
abalabahaha
13e8a39f9f Minor inconsistencies 2016-03-12 21:21:59 -08:00
abalabahaha
14fffb12af Accept user IDs as channels 2016-03-12 21:11:21 -08:00
abalabahaha
ea80677a79 Attempt to fix startPM 2016-03-11 22:12:15 -08:00
abalabahaha
d2a9f15e82 Fixed options + message cache limit + server member count + leaving users 2016-03-10 22:16:05 -08:00
abalabahaha
ef679e87c4 Attempted better ffmpeg handling 2016-03-10 21:40:19 -08:00
abalabahaha
b5c200901b Prepare for upcoming leave/deleteServer separation (fix #198) 2016-03-06 13:14:15 -08:00
abalabahaha
4e58de8cd6 Make FFMPEG error reject encoding 2016-03-06 13:04:23 -08:00
abalabahaha
dd6c158250 Use binary in sendFile (fix #172) 2016-03-06 10:55:32 -08:00
abalabahaha
7ec859d5a1 Remove console.log from compiled version 2016-03-06 04:54:31 -08:00
abalabahaha
538df5f76b memberMap on guild chunks, fire voice channel changes (fix #177) 2016-03-06 04:51:21 -08:00
abalabahaha
6889743d5e Tried to fix #201 2016-03-02 17:40:28 -08:00
abalabahaha
df73f52454 Human-readable bot user status 2016-03-02 17:35:28 -08:00
abalabahaha
159602b359 createInvite forgot to Promise properly 2016-02-25 18:27:33 -08:00
abalabahaha
beb44b7bfa large_threshold vs offline server owner vs ServerChannel.permissionsOf 2016-02-23 09:01:04 -08:00
abalabahaha
91a05be386 forceFetch callback when no fetch necessary 2016-02-20 22:25:53 -08:00
abalabahaha
0ec5d3e8d7 Empty array instead of undefined 2016-02-20 19:30:50 -08:00
abalabahaha
7b24127de5 ready fires after forceFetchUsers if option is true 2016-02-20 19:08:48 -08:00
abalabahaha
41924df875 Debug code lol 2016-02-20 18:45:26 -08:00
abalabahaha
47ecc934f1 Attempting forceFetchUser callback 2016-02-20 18:33:36 -08:00
abalabahaha
78b18de1e1 Random nonexistent object reference fixed 2016-02-19 00:02:08 -08:00
abalabahaha
5c9865fc3c Small fixes 2016-02-18 20:49:03 -08:00
abalabahaha
e4641fe701 resolveChannel should take PM channel IDs 2016-02-17 08:24:11 -08:00
abalabahaha
f49600af17 Use USER_UPDATE 2016-02-14 13:19:07 -08:00
hydrabolt
315ae22a7f potential server_member_update bugfix? 2016-02-13 21:04:47 +00:00
Amish Shah
9a57e7ab03 Merge pull request #184 from aequasi/179 
Adding volume wrapper
 2016-02-13 18:23:43 +00:00
hydrabolt
7144ead048 docs 6.66% 2016-02-13 18:21:59 +00:00
abalabahaha
e404361858 Un-meowwww 2016-02-12 19:59:41 -08:00
hydrabolt
54045de5f1 add member chunks 2016-02-12 22:07:56 +00:00
hydrabolt
f0c719cf71 see if user exists on presence before creating an entirely new one so username detection etc works 2016-02-12 21:43:05 +00:00
hydrabolt
60587c8d74 track new users from presence 2016-02-12 21:39:34 +00:00
hydrabolt
abde946864 added large_threshold as an option 2016-02-12 21:08:13 +00:00
Aaron Scherer
0571958033 Fixing conflicts 2016-02-12 13:08:03 -08:00
hydrabolt
5132c9ade4 added large_threshold 2016-02-12 21:03:27 +00:00
hydrabolt
42f053eb9f Merge remote-tracking branch 'origin/master' into indev 2016-02-12 20:44:18 +00:00
calc84maniac
701c0ca9c4 Let updateDetails use data.email if possible (thanks @calc84maniac) 2016-02-11 10:34:21 -08:00
abalabahaha
9fc5a752f8 colorAsHex should return hex (fixes #188) 2016-02-11 10:30:06 -08:00
Aaron Scherer
3c64cfce4a Adding volume wrapper 2016-02-10 09:53:05 -08:00
Aaron Scherer
c7103f8930 Update AudioEncoder.js 2016-02-09 09:39:44 -08:00
SooYou
fd5c981d83 fix resolveServer undefined when TextChannel 
So far it has been the case that resolveServer has been returning
undefined in the case that the resource was a Message from a TextChannel.
This was the case because the conditional returned the value of member
"server" in the Message object. The Message object doesn't have a server
member though. The fix is to use the "channel" member of the Message
object and return its "server" member which was likely the original
intention considering the if statement.
 2016-02-06 18:18:00 +01:00
Amish Shah
4b8f85d44a Exposed Discord.Cache 2016-02-04 21:09:30 +00:00
Neto Becker
3283283b4d fix game status not been updated when closing the game 2016-02-03 12:47:23 -02:00
Neto Becker
8d5949842c fix setUsername() 2016-02-03 12:41:19 -02:00
abalabahaha
9173ded903 Minor patching 2016-02-02 05:59:55 -08:00
abalabahaha
b7c1b6ebe6 Simulate channel structure if user's voice channel was not found 2016-02-01 17:26:29 -08:00
meew0
c773ea4e49 Check before a channel is a voice channel before joining it 2016-02-01 21:34:32 +01:00
meew0
e66311bdf5 Use resolveChannel instead of resolveVoiceChannel for joinVoiceChannel and get rid of resolveVoiceChannel 2016-02-01 21:30:57 +01:00
abalabahaha
6f7bd987b8 Allow get/getAll to take a function only 2016-01-31 22:37:31 -08:00
abalabahaha
580f260933 Support for regex/function in get/getAll 2016-01-31 22:30:02 -08:00
meew0
3a9d8fb518 Rebuild for 6.0.0 2016-01-31 16:01:37 +01:00
abalabahaha
cd25848bdc voiceStateUpdate stored per-server, some docs 2016-01-30 14:11:21 -08:00
abalabahaha
46807bf1c1 Fix unduplicated mentions 2016-01-30 13:16:18 -08:00
abalabahaha
89e3396af6 sendFile with non-image files (fix #172) 2016-01-30 12:48:53 -08:00
meew0
c1171e6973 Fix the regex in Resolve.resolveFile, fixes #171 2016-01-30 14:36:31 +01:00
meew0
634a5bd737 Fix the webdists, this fixes #170. 
Particular problems and how they were resolved:
 - The `fs-extra` module, used exclusively by TokenCacher, didn't have a browser version. I rewrote TokenCacher to not use fs-extra (see fdd4cfc7cc)
 - TokenCacher wouldn't work in the browser anyway due to lack of a file system. I made a shim (`Util/TokenCacher-shim.js`) that implements all TokenCacher functionality as null implementations, this causes `login` to always make a request.
 - Compressed packets couldn't be parsed because neither node's Buffers nor zlib were working correctly. Initially I tried to make a browser-only parser class that parses compressed `Blob` packets, but this didn't work out, so I just disabled compression by default.
 2016-01-30 14:17:27 +01:00
meew0
fdd4cfc7cc Remove the TokenCacher fs-extra dependency, rewrite init code 2016-01-30 12:09:41 +01:00
meew0
358c40c355 Set the volume default to 1 as @hydrabolt intended, fixes #154 2016-01-30 10:42:13 +01:00
abalabahaha
7fb39b6dc0 Fixed isMentioned 2016-01-30 01:28:58 -08:00
abalabahaha
5d4cd1fc28 Fix addMemberToRoles/removeMemberFromRoles 2016-01-29 22:11:12 -08:00
abalabahaha
e3173d1561 In-order + duplicate mentions, cleanContent in Messages 2016-01-29 22:05:01 -08:00
abalabahaha
8b392f359a add channel to voiceStateUpdate, reorder args 2016-01-29 21:45:49 -08:00
abalabahaha
dad570a4ec sendFile via URL 2016-01-29 21:45:03 -08:00
abalabahaha
35c800cc8f Fixed line of code (meew0) causing logins with new creds to fail 2016-01-29 21:01:35 -08:00
abalabahaha
b052d59e46 renamed voiceUserStateUpdate to voiceStateUpdate 2016-01-29 21:00:23 -08:00
abalabahaha
6af71bf639 The beginnings of the voiceUserStateChange event 2016-01-29 17:46:46 -08:00
abalabahaha
8726b23730 Resolve role IDs 2016-01-29 17:14:40 -08:00
abalabahaha
ee2172c1d5 memberHasRole, membersWithRole 2016-01-29 17:02:40 -08:00
abalabahaha
2c8747995a Merge addRoleToMember(s), merge removeRoleFromMember(s) 2016-01-29 14:55:07 -08:00
abalabahaha
be083b717e Merge pull request #168 from hydrabolt/issue/144 
Allow moving users to voice channels
 2016-01-29 14:04:05 -08:00
meew0
fe9911acc2 Don't require a server for moveMember 2016-01-29 23:03:12 +01:00
meew0
c93ed88daf Rebuild for voice moving 2016-01-29 22:46:42 +01:00
abalabahaha
79039f08a1 Fixing server updates 2016-01-25 00:34:16 -08:00
abalabahaha
4e9a11d7a9 sendFile typo 2016-01-24 18:31:51 -08:00
abalabahaha
2c17eaed02 Fix login, clone objects when firing x-Updated events 2016-01-24 16:41:35 -08:00
abalabahaha
2c6cbb6675 Merge remote-tracking branch 'ntay/sendfile-original-name' into indev 2016-01-24 16:15:28 -08:00
Nicholas Tay
3b3f5d831a More string checking, and stream filename checking (fs streams) 2016-01-25 11:07:06 +11:00
abalabahaha
44c1fc5b29 Fixed getChannelLogs before/after, added server unavailable checks in READY 2016-01-24 15:41:23 -08:00
Nicholas Tay
3a8f1ddbf9 Optional sendFile name callback and remove extra logic 2016-01-25 10:35:44 +11:00
meew0
042d7d1dbe Add voice channel moving, not quite working yet 2016-01-24 23:22:24 +01:00
meew0
c5174b4d93 Rebuild lib 2016-01-24 14:38:27 +01:00
Nicholas Tay
47f35a942c Make sendFile() use original file name by default 2016-01-24 21:23:09 +11:00
abalabahaha
76ab439033 Possibly fix messageUpdated 2016-01-20 22:45:30 -08:00
abalabahaha
b49870f12f Build stuff 2016-01-20 22:27:16 -08:00
abalabahaha
68435f0619 Handle unavailable guild, fix default getChannelLogs limit 2016-01-18 17:46:15 -08:00
abalabahaha
94f067cc51 Check if parts of server data exist 2016-01-16 17:09:25 -08:00
meew0
6f31130726 Rebuild lib after @enebe-nb's changes 2016-01-15 15:15:25 +01:00
abalabahaha
0164d3e7b5 Attempted merge of userUpdated and presence, along with before/after arguments 2016-01-13 23:35:37 -08:00
abalabahaha
fc58a0d5cf Attempting getInvites 2016-01-13 20:32:07 -08:00
abalabahaha
cffdb5f5f6 Improvement upon addMemberToRoles and build 2016-01-12 14:59:45 -08:00
abalabahaha
8a8ba51c2b Bad idle logic error 2016-01-06 21:39:05 -08:00
meew0
6a09ca76df Builds for the latest changes 2016-01-05 21:29:21 +01:00
abalabahaha
404829a19d Change gameID (Deprecated) to game 2016-01-04 20:46:28 -08:00
abalabahaha
69bffc6279 Finish renaming setChannelTopic 2016-01-04 20:37:15 -08:00
abalabahaha
2a00064646 Validate invite if possible 2016-01-03 11:14:17 -08:00
abalabahaha
718f0b9543 Rebuilt lib for dev and getInvite 2016-01-02 18:24:55 -08:00
Amish Shah
9c8e6eed24 5.3.2 web dists 2016-01-01 18:40:57 +00:00
Amish Shah
2000b62b36 fixed references to update items 2016-01-01 18:27:08 +00:00
meew0
7860828a5d Rebuild 2015-12-31 22:57:33 +01:00
Amish Shah
b927b223bb 5.3.1 2015-12-26 18:35:08 +00:00
Amish Shah
8d0fc8e0a6 Resilience to abusers of the API 
For some reason there's a way to join text channels via the Discord API but not the Discord Client, so this commit
prevents the Client from crashing by checking to see if the channels are voice channels.
 2015-12-26 18:32:46 +00:00
Amish Shah
f9f7a568fc 5.3.0 web dists 2015-12-26 18:21:04 +00:00
Amish Shah
8e16abee96 Fixed server.detailsOf(user) 
Now points to correct function
 2015-12-26 18:16:42 +00:00
Amish Shah
3b7c5aa96a Rename voiceconnection.speaking to voiceconnection.memberd 2015-12-26 18:05:31 +00:00
Amish Shah
0113202c2f Fixed voice_connection.stopPlaying 
Now unpipes before destroying
 2015-12-26 17:52:20 +00:00
Amish Shah
9d97dfc95a Voice States in READY packet now processed 
Now there is full watching and coverage of voice states
 2015-12-26 15:54:45 +00:00
Amish Shah
9c0e20947c Added websocket voice state watching 
Now emits voiceJoin(user, voice_channel) or voiceLeave(user, voice_channel) and adds/removes from voice_channel.speaking when a user joins or leaves a voice channel.
 2015-12-26 15:38:53 +00:00
Amish Shah
7b2f4e3357 Added Cache 2015-12-26 15:12:58 +00:00
abalabahaha
830cc64828 Fixed #105 and built 2015-12-26 15:10:32 +00:00
Amish Shah
7819dcb3d1 browserified 5.2.0 2015-12-23 22:58:25 +00:00
Amish Shah
2253560631 fix travis bugs and mentions 2015-12-23 22:36:31 +00:00
meew0
14682ba2bf Lib output for arbitrary ffmpeg playback 2015-12-23 23:22:18 +01:00
Amish Shah
4d6adfd289 voice fixes 2015-12-23 21:10:49 +00:00
Amish Shah
0e6ff52c61 PM bug fix 2015-12-22 23:36:10 -08:00
Amish Shah
d93990822e Emergency bug fix 
Stopped the client from assuming all errors were 429 errors
 2015-12-22 23:36:01 -08:00
Amish Shah
d8ac7e97a1 Removed console.log 2015-12-19 21:24:02 +00:00
Amish Shah
90045db92d fixed mentions even though they will be changed in the future... why 2015-12-19 21:22:06 +00:00
Amish Shah
941fd2fe98 Minor changes 2015-12-17 18:31:52 +00:00
Amish Shah
b82c318e96 Added option to count rate limits as errors 
`options.rate_limit_as_error`
 2015-12-16 18:51:32 +00:00
Amish Shah
470fbbb6d6 Fixed rate limiting 2015-12-16 18:46:03 +00:00
Amish Shah
da990f544a Token Cache bug fix and Rate Limiting 2015-12-16 18:32:01 +00:00
Amish Shah
8f8504810a Privacy improvement over token caching 
e-mail is no longer visible in caches
 2015-12-14 18:28:27 +00:00
Amish Shah
8f5722d242 Token Caching now works 2015-12-14 18:06:03 +00:00
Amish Shah
a122f0994e Stuff 2015-12-13 20:10:33 +00:00
abalabahaha
ecc604e6ac Fixed getChannelLogs bug (template string variable without ${}) 2015-12-13 02:00:01 -08:00
Amish Shah
c9c1b19968 Fixed message.isMentioned 2015-12-12 21:37:34 +00:00
Amish Shah
c2cf1badfd Fixed multiple avconvs/ffmpeg processes still staying alive 2015-12-12 21:04:30 +00:00
Amish Shah
4d43867206 Fixed multiple ffmpeg/avconv processes being alive 2015-12-12 18:04:48 +00:00
Amish Shah
d66b765933 added volume control 2015-12-12 17:52:25 +00:00
Amish Shah
60747afda4 Rebuilt cache changes 2015-12-12 17:32:49 +00:00
Amish Shah
8eb4c47f79 Client now emits unknown and hidden some properties of Cache 
Cache.discrim and Cache.discrimCache are now hidden from for..in
 2015-12-12 17:32:20 +00:00
abalabahaha
cd4a70cfb2 Fixed the fix and built 2015-12-11 21:37:59 -08:00
qeled
f280349f0c Fix sequence and timestamp in VoiceConnection 2015-12-11 19:48:32 +00:00
qeled
d8af1a49ae Disable ffmpeg logging and ignore stderr 2015-12-11 19:48:32 +00:00
Amish Shah
a789b1f396 reply no longer mentions in PM 
for much more fluent conversations in PM
 2015-12-09 18:56:20 +00:00
Amish Shah
d9b9d1d0a3 build changes and fix presence bug 2015-12-09 18:26:25 +00:00
Amish Shah
6cff34ae3c try again 2015-12-06 21:02:24 +00:00
Amish Shah
ff7adf1cf7 basic speed improvement - eats more memory 2015-12-06 20:53:23 +00:00
Amish Shah
b59f2940e3 finalised revive 2015-12-06 20:19:30 +00:00
Amish Shah
d504406cfc partially working autorevive 2015-12-06 19:30:32 +00:00
Amish Shah
706682af55 fixed voice intervals not dying, bot will now fully die on close 2015-12-06 19:07:34 +00:00
Amish Shah
e072c58460 added interval fixes - bots die gracefully now 2015-12-06 19:02:10 +00:00
abalabahaha
4486b623f5 Build lib and update dependencies 2015-12-06 00:53:35 -08:00
Amish Shah
e16211c4fb Added stereo support 2015-12-05 21:19:38 +00:00
Amish Shah
d122184b6b voice fixes 2015-12-05 20:57:23 +00:00
abalabahaha
d2147304c8 Compiled lib 2015-12-05 11:32:33 -08:00
Amish Shah
780565ff68 Added shortcuts to user and server classes 
User.addTo User.removeFrom Server.leave/delete Server.createInvite Server.createRole
 2015-12-05 17:03:05 +00:00
Amish Shah
5a971ba097 Added role shortcuts and to user also 2015-12-05 16:57:58 +00:00
Amish Shah
f95822dcb7 Added message.edit, textchannel.send, textchannel.sendTTS and pmchannel.send, pmchannel.sendTTS 2015-12-05 16:48:09 +00:00
Amish Shah
2b3418faf4 built serverCreate changes 2015-12-05 12:03:55 +00:00
Amish Shah
4f2e2a115c v5.1.0 web dists 2015-12-04 21:09:26 +00:00
Amish Shah
e01b4eb114 v5.1.0 finalised bug fixes 2015-12-04 21:07:15 +00:00
Amish Shah
ac2398e47c started working on bug fixes and test scripts 2015-12-04 20:30:11 +00:00
abalabahaha
6564c27faf Folder turned necessary after Discord debate 2015-11-28 21:24:49 -08:00
abalabahaha
eaf30cc80c Removed unnecessary folder 
If you're cloning from the repo, use "grunt --dev" to generate it
 2015-11-28 10:58:56 -08:00
abalabahaha
8cb912090f Don't overwrite permissions in updateRole if they aren't passed 2015-11-22 20:25:52 -08:00
abalabahaha
014d78638e messageDeleted passes channel 2015-11-22 17:49:23 -08:00
abalabahaha
c9497a0f75 Emit -ed and fixed presence vs. userUpdated check 2015-11-22 17:15:49 -08:00
Amish Shah
213379e669 Fixed compiled version 
Downgraded babel until a working solution found
 2015-11-22 17:13:52 +00:00
Amish Shah
e5ad0e23aa Rebuilt internal client 2015-11-22 15:34:18 +00:00
Amish Shah
41cd3f0ce1 Fixed bug where banning would not work 2015-11-22 15:32:14 +00:00
Amish Shah
b22995f254 Built src again using the correct preset 2015-11-22 15:12:39 +00:00
Amish Shah
68b60c5464 rebuilt files 2015-11-22 15:01:42 +00:00
hydrabolt
cf33df18cf Simplified awaitResponse 2015-11-21 21:25:28 +00:00
hydrabolt
d916e5719b Fixed awaiting 2015-11-21 20:59:33 +00:00
hydrabolt
ddfed4da6c Added awaiting internally 2015-11-21 20:50:58 +00:00
hydrabolt
4ba90f36fe Added cache.random() and node engine to package.json 2015-11-21 18:35:51 +00:00
hydrabolt
08544d3cd5 Documented new additions 2015-11-21 15:07:32 +00:00
hydrabolt
65698cf525 Added new functions 
setStatusIdle() - aliases setStatusAway
setStatusOnline() - aliases setStatusActive and setStatusHere

setPlayingGame() - uses GameID resolvable
 2015-11-21 14:55:15 +00:00
abalabahaha
0ba7a1796e msg.sender is an alias to msg.author 2015-11-20 17:17:25 -08:00
abalabahaha
4b7faf9754 Bye old files 2015-11-20 17:14:18 -08:00
hydrabolt
409635d50a v5.0.0! Woo! 2015-11-20 22:12:02 +00:00
hydrabolt
979909a570 Added message docs 2015-11-20 20:54:59 +00:00
hydrabolt
19fb8e6dfd Finished channels 2015-11-20 20:44:09 +00:00
hydrabolt
b6f158fac4 Updated docs 2015-11-20 16:40:26 +00:00
hydrabolt
ae635685da Updated docs to include abala's additions 2015-11-19 20:58:24 +00:00