1
0
mirror of https://github.com/Tha14/toxic.git synced 2024-11-15 07:23:02 +01:00
Commit Graph

70 Commits

Author SHA1 Message Date
irungentoo
43d0d7a1c0 astyle --options=tools/astylerc -r ./*.{c,h} 2013-08-20 19:37:05 -04:00
irungentoo
05fd02767f Refactor of core done. 2013-08-20 14:47:32 -04:00
irungentoo
da369f1507 More refactoring done. 2013-08-20 12:08:55 -04:00
Michael Rose
512abe64f4 fixed space handling in commands (issue #495) 2013-08-20 13:40:15 +02:00
irungentoo
3b58ad06b0 Merge branch 'tox-bugs' of https://github.com/stqism/ToxCore into stqism-tox-bugs 2013-08-18 10:19:35 -04:00
Sean Qureshi
ccfff8b305 Ran it through astyle 2013-08-18 01:48:36 -07:00
Aaron Lipinski
901d8eb8b9 remove callback introduced temporarily during refactoring 2013-08-18 20:35:38 +12:00
Michael Rose
5d8ccde3d9 Messenger stores / loads nickname
new toxic command to show nickname (mynick)
2013-08-17 11:59:28 +02:00
irungentoo
9dce121a76 Passed everything through astyle. 2013-08-16 13:11:09 -04:00
Michael Rose
399dd33b97 Merge fix 2013-08-15 12:11:48 +02:00
Jfreegman
202d162d2e small bug fixes 2013-08-14 16:02:21 -04:00
irungentoo
42028289c5 Merge branch 'patch-6' of https://github.com/Astonex/ProjectTox-Core into pr 2013-08-14 09:00:55 -04:00
Aaron Lipinski
2c81fd5e4b remove externs in favor of includes 2013-08-15 00:36:30 +12:00
Aaron Lipinski
5d07842d96 prefer param over static
Conflicts:
	testing/toxic/main.c
2013-08-15 00:34:22 +12:00
Astonex
4a6edcbf1e Update prompt.c
Make id uppercase.
2013-08-14 11:23:38 +01:00
Aaron Lipinski
ce9d066054 Have toxic handle new no-spam values from friend request 2013-08-14 21:16:58 +12:00
irungentoo
2857e6af8f 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
8687a54a87 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
309de72829 make argument handling (esp. of strings) more robust 2013-08-10 20:10:03 -04:00
Luke Champine
0314d11bf0 make toxic handle input in a more sane manner 2013-08-09 10:31:29 -04:00
irungentoo
ed10f009bd Merge pull request #393 from Nominate/patch-1
Removed superfluous statusmsg
2013-08-08 08:26:19 -07:00
Nominate
6a37d6e9f1 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
757073a461 oops 2013-08-08 04:55:22 -04:00
Jfreegman
297ee1ecaa fix magic numbers 2013-08-08 04:51:58 -04:00
Maxim Biro
90acd2dfef 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
8e881ca50f 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
174604a448 Modified clients to properly work with the changes 2013-08-07 18:12:59 -04:00
Sean Qureshi
84847d8e29 Manually merged prompt.c to upstream 2013-08-07 10:57:17 -07:00
irungentoo
57601e0c1a 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
660bfc1340 Check for correct error value in toxic. 2013-08-07 09:57:23 -07:00
Sean Qureshi
9e5c88859a Fixed it not compiling 2013-08-07 09:35:37 -07:00
irungentoo
088e7d3e17 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
41238577e4 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
5614e73a17 Manually merged my earlier commits with upstream 2013-08-07 00:24:37 -07:00
ptrasd
132576c28c testing/toxic/prompt.c: changed execute() to ignore whitespace at end of commands 2013-08-07 02:25:20 -04:00
ptrasd
78a37829c5 testing/toxic/prompt.c: changed execute() to skip whitespace at start of command 2013-08-07 02:10:46 -04:00
Jfreegman
5fd1a658bc code format/clean up 2013-08-06 18:27:51 -04:00
irungentoo
2fbe37f7cf 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
c9546b38d4 Fixed formatting 2013-08-06 11:50:10 +01:00
Nominate
79a731991f Update prompt.c 2013-08-06 11:20:11 +01:00
Nominate
dfff1e3cc4 Corrected wrap-around
This should allow wrap-around and allow proper execution.
2013-08-06 11:16:17 +01:00
Nominate
1701ed7023 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
173a1f8fb6 Merge pull request #341 from stal888/userstatus-ext
An extension to user statuses.
2013-08-05 17:24:04 -07:00
Jfreegman
6494a4070b chat window deleting and re-adding - it just werks 2013-08-05 16:04:06 -04:00
Sebastian Stal
51598d626a Make test clients compatible with userstatus kinds
No features were added, just fixed callbacks.
2013-08-05 12:30:40 -07:00
Nominate
aaf3ce9761 Grammar/aesthetic amendment 2013-08-05 18:52:28 +01:00
Nominate
34a8d6ecb9 Added a 'clear' function to the prompt 2013-08-05 18:33:16 +01:00
Jfreegman
765a722c90 added ability to close and reopen chat windows & other minor changes 2013-08-05 01:57:29 -04:00
Sean Qureshi
6f9dea8510 Manally merged #314 and #317 2013-08-04 03:52:24 -07:00
Jfreegman
337d87a3ef already a pull request with this addition 2013-08-04 05:32:53 -04:00