irungentoo
88ff81d9de
Passed everything through astyle.
2013-08-16 13:11:09 -04:00
Michael Rose
76bfefff6f
Merge fix
2013-08-15 12:11:48 +02:00
Jfreegman
aa114d2778
small bug fixes
2013-08-14 16:02:21 -04:00
irungentoo
0e0785c822
Merge branch 'patch-6' of https://github.com/Astonex/ProjectTox-Core into pr
2013-08-14 09:00:55 -04:00
Aaron Lipinski
75ce48146a
remove externs in favor of includes
2013-08-15 00:36:30 +12:00
Aaron Lipinski
4e21ac0d57
prefer param over static
...
Conflicts:
testing/toxic/main.c
2013-08-15 00:34:22 +12:00
Astonex
1260aee9e1
Update prompt.c
...
Make id uppercase.
2013-08-14 11:23:38 +01:00
Aaron Lipinski
3b42f489e4
Have toxic handle new no-spam values from friend request
2013-08-14 21:16:58 +12:00
irungentoo
97f449a2f1
Fixed spam problem. (I broke the API so this will not build)
...
The friend address is what the byte string that you give away for people
to add you will be called.
1. Every friend address now contains a number set by the friend. This is
to prevent someone from randomly spamming people in the DHT with friend
requests and makes it so you need the person to actually give you the
address in some way to send the friend request. This number is expected
to be encrypted with the friend request. All requests that do not
contain this number will be rejected. This means the spammer can no
longer use the DHT to collect lists of valid addresses to spam. It also
enables users to quickly change the number in case a spammer gets hold
of the address and starts spamming it.
2. A 2 byte checksum will be added (not implemented yet) to prevent
people from accidentally adding random strings as friends. (NOTE that
this has nothing to do with the spam problem I just decided to add a
placeholder for it now.)
2013-08-13 09:32:31 -04:00
Chris Hall
4293c4b1e6
Messenger refactor - redid work from pull request 79
...
Moves static state out of Messenger.c and into a Messenger struct
Purely stylistic, no functional changes were made.
This commit also changed all the callers of Messenger as they now have
to pass an instance of the Messenger struct to messenger functions.
Also removed some uses of the 'static' keyword at the beginning of
function definitions when the function was already declared static, as
these caused gcc to whine.
2013-08-12 21:37:38 +12:00
lukechampine
1139ca57a5
make argument handling (esp. of strings) more robust
2013-08-10 20:10:03 -04:00
Luke Champine
b378a246a0
make toxic handle input in a more sane manner
2013-08-09 10:31:29 -04:00
irungentoo
997a15d294
Merge pull request #393 from Nominate/patch-1
...
Removed superfluous statusmsg
2013-08-08 08:26:19 -07:00
Nominate
d9750569ac
Removed superfluous statusmsg
...
Users can just respecify their status with a message. This will also encourage users to think about which status is actually appropriate instead of just leaving the status alone.
2013-08-08 11:09:46 +01:00
Jfreegman
0f2b4e5c77
oops
2013-08-08 04:55:22 -04:00
Jfreegman
6f98fc47b0
fix magic numbers
2013-08-08 04:51:58 -04:00
Maxim Biro
f669b28a6c
Merge branch 'master' of http://github.com/irungentoo/ProjectTox-Core
...
Conflicts:
core/Messenger.c
core/Messenger.h
2013-08-07 19:18:40 -04:00
irungentoo
00ecb05c1b
Merge branch 'master' of https://github.com/stqism/ProjectTox-Core into pull-requests
...
Conflicts:
testing/toxic/prompt.c
2013-08-07 18:20:36 -04:00
Maxim Biro
b1a2af23e5
Modified clients to properly work with the changes
2013-08-07 18:12:59 -04:00
Sean Qureshi
3622a5c04c
Manually merged prompt.c to upstream
2013-08-07 10:57:17 -07:00
irungentoo
59f873fd68
Merge branch 'read-receipt' of https://github.com/stal888/ProjectTox-Core into pull-requests
...
Conflicts:
testing/toxic/chat.c
testing/toxic/prompt.c
2013-08-07 13:51:58 -04:00
Sebastian Stal
9f6262f3dd
Check for correct error value in toxic.
2013-08-07 09:57:23 -07:00
Sean Qureshi
2b916b96bd
Fixed it not compiling
2013-08-07 09:35:37 -07:00
irungentoo
5a8da17e61
Merge branch 'provide-status-type' of https://github.com/jin-eld/ProjectTox-Core into pull-requests
2013-08-07 09:11:51 -04:00
jin-eld
ba48234bfc
Allow to set a specific userstatus type in toxic
...
Use:
status <type> <message>, where type is one of
online
away
busy
offline
The message parameter is optional.
To set only the status message, as it was before, use:
statusmsg <message>
2013-08-07 10:28:17 +03:00
Sean Qureshi
ea969c6e42
Manually merged my earlier commits with upstream
2013-08-07 00:24:37 -07:00
ptrasd
caa75b52c3
testing/toxic/prompt.c: changed execute() to ignore whitespace at end of commands
2013-08-07 02:25:20 -04:00
ptrasd
b32a7b2294
testing/toxic/prompt.c: changed execute() to skip whitespace at start of command
2013-08-07 02:10:46 -04:00
Jfreegman
16b3ec746e
code format/clean up
2013-08-06 18:27:51 -04:00
irungentoo
eacd12385f
Merge branch 'master' of https://github.com/JFreegman/ProjectTox-Core into JFreegman-master
...
Conflicts:
testing/toxic/prompt.c
2013-08-06 10:16:26 -04:00
Nominate
532f16a377
Fixed formatting
2013-08-06 11:50:10 +01:00
Nominate
fb9791bc69
Update prompt.c
2013-08-06 11:20:11 +01:00
Nominate
45c84e55e6
Corrected wrap-around
...
This should allow wrap-around and allow proper execution.
2013-08-06 11:16:17 +01:00
Nominate
1f001b2f91
Stops line-spamming and clears before printing help
...
This addresses one issue in #340 perfectly and slightly improves the other.
2013-08-06 08:10:05 +01:00
irungentoo
109fe7bd0a
Merge pull request #341 from stal888/userstatus-ext
...
An extension to user statuses.
2013-08-05 17:24:04 -07:00
Jfreegman
4b76983a69
chat window deleting and re-adding - it just werks
2013-08-05 16:04:06 -04:00
Sebastian Stal
5ec3b2330e
Make test clients compatible with userstatus kinds
...
No features were added, just fixed callbacks.
2013-08-05 12:30:40 -07:00
Nominate
42c79dfcbb
Grammar/aesthetic amendment
2013-08-05 18:52:28 +01:00
Nominate
39545a92da
Added a 'clear' function to the prompt
2013-08-05 18:33:16 +01:00
Jfreegman
3bc7f15fe5
added ability to close and reopen chat windows & other minor changes
2013-08-05 01:57:29 -04:00
Sean Qureshi
b471236c50
Manally merged #314 and #317
2013-08-04 03:52:24 -07:00
Jfreegman
91d883c4a4
already a pull request with this addition
2013-08-04 05:32:53 -04:00
Jfreegman
b513c3d352
added command functionality to chat windows and a few minor improvements
2013-08-04 04:42:17 -04:00
Jfreegman
c13de2d285
added command to clear prompt screen
2013-08-03 17:13:44 -04:00
irungentoo
8cb960e785
Merge pull request #281 from JFreegman/master
...
cursor done better, fixed for chat windows
2013-08-03 05:14:44 -07:00
g
dd6f44a2c7
Added break Statement
2013-08-03 15:59:46 +08:00
Jfreegman
8fa074db5e
cursor done better, fixed for chat windows
2013-08-02 21:36:01 -04:00
irungentoo
af8e843451
Merge pull request #229 from JFreegman/master
...
fixed friend add bugs and gave no message its own error
2013-08-01 17:38:29 -07:00
Jfreegman
8abc0a3462
added error code for no message on friend add & updated nTox.c/nTox_win32.c
2013-08-01 15:27:08 -04:00
plutooo
3d916b35f2
core: getaddrinfo() lookup error handling
2013-08-01 11:54:06 -07:00
