Commit Graph

5083 Commits

Author SHA1 Message Date
sehraf
ae14a01d58
add json support to getWaitingDiscCount 2018-09-07 14:19:06 +02:00
sehraf
be50400114
jsonfy rsDisc 2018-09-07 14:17:44 +02:00
sehraf
fb8e49ee66
jsonjy rsConfig 2018-09-07 12:58:30 +02:00
csoler
b17d2a3aca
Merge pull request #1331 from G10h4ck/jsonapi
JSON API improvements
2018-09-06 08:39:30 +02:00
Gioacchino Mazzurco
2c8aa5a1fe
RsAccounts::getCurrentAccountId is now static 2018-09-06 02:04:48 +02:00
csoler
4a309b827a
fixed compilation with libressl2.7 (patch from sss, modified) 2018-09-05 21:00:34 +02:00
Gioacchino Mazzurco
7787f9d62f
Merge branch 'master' into jsonapi 2018-09-05 00:17:21 +02:00
Gioacchino Mazzurco
a194e4cf56
Make JSON API server bind address configurable
Enforce it being 127.0.0.1 by default, I assumed 127.0.0.1 was restbed
default, but as reported by sehraf is not alwayd the case

JSON API bind address now is also configurable via commandline on
retroshare-android-service and retroshare-nogui, while it obey the
configuration of webui (execept for that port is incremented by 2)
in retroshare-gui
2018-09-05 00:08:56 +02:00
Gioacchino Mazzurco
7f74313552
JSON API close restbed session before shutting down 2018-09-01 15:54:11 +02:00
Gioacchino Mazzurco
7a37c11e47
Prevent crash calling uninitialized service via JSON API 2018-09-01 15:29:09 +02:00
Gioacchino Mazzurco
cc6f0b1f05
Expose RsPeers JSON API
Added also new method for better usability via the API that allow to add
  friend directly for RetroShare invitation (supports also URL) without
  having to call to mulptiple metods to set IP etc.
  RsPeers::acceptInvite
  /rsPeers/acceptInvite
2018-08-30 21:45:51 +02:00
Gioacchino Mazzurco
a8ddec03fc
Expose more login related JSON API
/rsLoginHelper/isLoggedIn to check if already logged in
/rsAccounts/getCurrentAccountId to get the id of current selected
  account, beware that an account may be selected without actually logging in
2018-08-30 19:09:50 +02:00
csoler
65304a301a
added last relay (a.k.a which direct friend) of search results in sources column 2018-08-28 23:57:16 +02:00
csoler
c9b30f5a72
fixed merged with upstream/master 2018-08-28 23:42:24 +02:00
csoler
c294971633
Merge pull request #1289 from G10h4ck/jsonapi
Implement automatic JSON API generation
2018-08-28 19:11:08 +02:00
Gioacchino Mazzurco
dd55ddea95
Add more consistency checks to serialization code
As suggested by Cyril
2018-08-28 15:20:41 +02:00
Gioacchino Mazzurco
3094146c13
RsLoginHelper::attemptLogin clear cached passphrase after usage
Thanks Cyril for suggestion
2018-08-28 14:35:29 +02:00
Gioacchino Mazzurco
75e882bb9f
Make NotifyClient class again 2018-08-28 14:12:09 +02:00
csoler
5f18d26738
removed unused member depth from search results to avoid confusion while ensureing backward compatibility is kept 2018-08-27 23:36:21 +02:00
csoler
fd25f8336e
Merge pull request #1329 from sehraf/pr_small-fixes
small fixes
2018-08-27 10:56:29 +02:00
Gioacchino Mazzurco
1dfe64443f
Improve documentation 2018-08-26 11:39:26 +02:00
csoler
2fab33d37f
fixed a few bugs in ban file list management 2018-08-25 20:52:06 +02:00
csoler
b5eabf7af7
improved banned files UI and fixed deadlock 2018-08-25 20:18:54 +02:00
csoler
c14d898901
added some debug info to file control system and fixes a problem with sending TS 2018-08-25 18:44:29 +02:00
G10h4ck
41f7235ed0
Merge pull request #2 from sehraf/pr_improve_json
Multiple fixes on json handling by sehraf
2018-08-25 18:05:56 +02:00
Gioacchino Mazzurco
c50405c070
Expose /rsFiles/turtleSearchRequest via JSON API
Expose new async C++ API RsFiles::turtleSearchRequest with callback
Modernize TurtleFileInfo serialization code keeping retrocompatibility
2018-08-25 17:58:04 +02:00
sehraf
9557a5246e
remove unnecessary locking, print log entries also to stdout 2018-08-25 17:54:34 +02:00
sehraf
c754435944
fix deserialisation and improve PRINT job 2018-08-25 17:10:01 +02:00
Gioacchino Mazzurco
a8b2532d3b
Fix warning #pragma once used in main file
Probably a copy paste error made during license cleanup
2018-08-25 17:04:42 +02:00
sehraf
588295e1e5
make RsGroupInfo serializable 2018-08-25 16:52:46 +02:00
sehraf
4d03b906b8
convert values properly to string 2018-08-25 16:51:49 +02:00
Gioacchino Mazzurco
31f0a42b86
Merge branch 'csoler/v0.6-FT' into jsonapi
Needed to exopse JSON API for file search
2018-08-25 16:14:42 +02:00
Gioacchino Mazzurco
b98246ee21
Fix location creation via JSON API
To complete location creation login is needed
2018-08-25 00:19:26 +02:00
csoler
8eebe53d75
moved UI notification for turtle FT search results into ftServer, in order to allow easier libresAPI calls 2018-08-24 16:12:05 +02:00
Gioacchino Mazzurco
afb92999d8
Enable JSON conversion for RsGxsImage via MemBlockProxy 2018-08-24 00:31:25 +02:00
Gioacchino Mazzurco
afeb408f7a
Expose more RsFiles via JSON API
FileInfo remove dead static members
2018-08-23 22:38:21 +02:00
Gioacchino Mazzurco
4d30d4f32b
Avoid cloning huge unused restbed openssl dependency 2018-08-23 15:47:01 +02:00
Gioacchino Mazzurco
18feb23c77
Suggest shallow submodules for jsonapi dependencies 2018-08-23 14:20:24 +02:00
Gioacchino Mazzurco
3b72f912e4
Improve API
Manually expose /rsFiles/getFileData to stream/preview files
Automatically expose a bunch of methods via JSON API
Implement serial_process for std::pair
2018-08-23 01:39:26 +02:00
csoler
3055897425
added filter in p3turtle against banned hashes in tunnel requests and search results 2018-08-22 21:57:56 +02:00
Gioacchino Mazzurco
ab6a5c07cc
RsLoginHelper::createLocation expose capability of creating hidden locations 2018-08-22 17:22:27 +02:00
Gioacchino Mazzurco
8f7bacbb35
Remove #pragma once in .cc file
It was probably introduced by copy paste error on license cleanup
2018-08-22 17:00:22 +02:00
Gioacchino Mazzurco
396fe49312
Merge branch 'master' into jsonapi 2018-08-22 16:59:42 +02:00
csoler
365464623a
added load/save of banned files and handling of banned files information from friends 2018-08-21 11:20:02 +02:00
csoler
0b176a0fe5
added sending of banned file info 2018-08-20 23:30:05 +02:00
csoler
e5e566051b
added logic to compute ban list from friend nodes and own opinions 2018-08-19 21:11:17 +02:00
csoler
af7556610a
added option whether to trust friend nodes for banned files 2018-08-19 15:52:35 +02:00
Gioacchino Mazzurco
fe8c2c4683
Merge branch 'jsonapi' of github.com:G10h4ck/RetroShare into jsonapi 2018-08-16 23:51:35 +02:00
Gioacchino Mazzurco
4b6f751b09
Implement JSON API generation for async API calls
Move JSON helpers to util/rsjson.* for better usability
Implement JSON ostream manipulator to print compact and pretty JSON
Use lambdas for API wrappers, integrate better and avoid namespace
  pollution
Removed experimental JSON API for notify client wrapper, notifications
  can be implemented automatically with moderns async API calls
Implement and automatically expose to JSON API
  RsGxsChannels::turtleSearchRequest(
        const std::string& matchString,
        const std::function<void (const RsGxsGroupSummary&)>& multiCallback,
        std::time_t maxWait )
2018-08-16 23:48:21 +02:00
csoler
e17c4d0e40
added a dialog to edit banned files 2018-08-16 22:22:47 +02:00