Commit Graph

112 Commits

Author SHA1 Message Date
0xboobface b90313dd86 Restart websocket, if no message arrived for 2 mins 2018-10-31 01:34:45 +01:00
0xboobface 91210f8add Add comment 2018-10-30 23:21:55 +01:00
0xboobface 7d4245e44e Disable tips for the time being 2018-10-30 23:21:39 +01:00
0xboobface d6b443b05a Implement follow and unfollow for CamsodaModel 2018-10-30 23:18:50 +01:00
0xboobface 5333e427ad Add CamSoda login dialog
This dialog is shown, if the normal login didn't work. For example,
if you log in several times in a short amount of time, they respond
with "Please confirm that you are not a robot" and you have to log
in with a captcha
2018-10-30 21:13:48 +01:00
0xboobface efbae57113 Set webengine user dir to child of config dir 2018-10-30 21:10:42 +01:00
0xboobface 3d245d6515 Add buttons to follow and open in browser to show tab 2018-10-30 19:07:10 +01:00
0xboobface b476c452ad Merge branch 'dev' into camsoda
Conflicts:
	src/main/java/ctbrec/Settings.java
	src/main/java/ctbrec/recorder/server/HttpServer.java
	src/main/java/ctbrec/ui/CamrecApplication.java
	src/main/java/ctbrec/ui/ThumbCell.java
2018-10-30 19:06:20 +01:00
0xboobface b19ea01ce7 Only do initial login if credentials are available 2018-10-30 18:24:40 +01:00
0xboobface 0c9fc5cba6 Fix JSON parse exception 2018-10-30 15:57:44 +01:00
0xboobface 007ed19d97 Add more tabs
Add tabs for male and couples
2018-10-30 15:57:24 +01:00
0xboobface c445e48d6d Don't try to log in twice 2018-10-30 15:24:02 +01:00
0xboobface 7f3bedd3a1 Clean up code 2018-10-29 23:25:50 +01:00
0xboobface 2ffdbfa71a Add followed tab for Cam4 2018-10-29 21:53:41 +01:00
0xboobface dab3466cf6 Simplify login method 2018-10-29 21:53:15 +01:00
0xboobface 4d1e841448 Improve login success check 2018-10-29 18:12:52 +01:00
0xboobface 936984c71d Add window icon to Cam4 login dialog 2018-10-29 17:57:14 +01:00
0xboobface 43cb005fcd Add login dialog for Cam4
The login dialog uses a WebView to load the login form from cam4.com
Username and password get filled in by ctbrec, the user has to solve
the captcha. Afterwards all cookies (especially the session cookie)
are extracted from the webview and transfered to the OkHttp client,
so that it can be used for further requests.
2018-10-29 17:36:58 +01:00
0xboobface dc6b514d8f Disable follow/unfollow for the time being 2018-10-29 13:49:04 +01:00
0xboobface 8fd09fd521 Implemented followed tab for CamSoda 2018-10-28 21:23:58 +01:00
0xboobface a841457a90 Add HD tab 2018-10-27 23:28:08 +02:00
0xboobface 34f443c6a9 First addition for Cam4 2018-10-27 22:32:07 +02:00
0xboobface 7442ddd3e4 Show thumb, if offline_picture is not available
Tweak the insets
2018-10-27 18:50:29 +02:00
0xboobface 07864dc10a Add Camsoda tab with upcoming shows 2018-10-27 18:40:24 +02:00
0xboobface d4bff345a1 Add Camsoda to sites in HttpServer 2018-10-26 23:01:17 +02:00
0xboobface 209ec64e3d Merge branch 'dev' into camsoda 2018-10-26 14:33:33 +02:00
0xboobface 4e0fb6aaf0 Ignore models for disabled sites in LocalRecorder 2018-10-26 14:16:17 +02:00
0xboobface ebbfacd802 Complete json parsing 2018-10-26 01:55:08 +02:00
0xboobface 60494a09fd Sort by camsoda sort value 2018-10-26 01:23:07 +02:00
0xboobface 6ca7d43069 Implemented camsoda 2018-10-26 01:03:13 +02:00
0xboobface 02b50f61c5 Merge branch 'dev' into camsoda 2018-10-25 20:11:53 +02:00
0xboobface 5cd8ae3cff Add possibility to disable sites
Sites can be disabled in the settings, so that they don't get
initialized on start. The UI is not created for them aswell.
2018-10-25 20:11:25 +02:00
0xboobface 9f9d726e5c Add site Camsoda
Add new package and classes for camsoda.com
2018-10-25 16:19:47 +02:00
0xboobface f0154857d9 Add mechanisms to have credentials/settings for each site
Each site can now provide its own configuration panel. For
Chaturbate and MyFreeCams these panels contain input fields
for the user credentials.
2018-10-25 12:27:46 +02:00
0xboobface 7e6f5bbc2c Add log statement 2018-10-25 10:55:24 +02:00
0xboobface 91a41d446b Add trace log statement for arriving NULLs
This helps to see, if the websocket is still healty
2018-10-25 10:50:57 +02:00
0xboobface 54381c1676 Change filter in HD cams update service
Chnage the filter to include streams from wowza servers
2018-10-25 00:01:59 +02:00
0xboobface 0bcea4e753 Fix message parser
The parser didn't take into accoun, that the arriving string can
contain several messages
2018-10-24 23:40:53 +02:00
0xboobface ff0d1b5eae Fix live preview for wowza servers 2018-10-24 23:39:46 +02:00
0xboobface 0935343dc1 Replace System.out.prints with log messages 2018-10-24 20:04:33 +02:00
0xboobface 0085ce7ab8 Add marker interface to mark tabs, which contain followed models 2018-10-24 20:02:00 +02:00
0xboobface b80fbd4c30 Add proper login and follow/unfollow to MyFreeCamsClient 2018-10-24 19:55:31 +02:00
0xboobface f0d2a720ab Don't try to load followed models, if username is not set 2018-10-24 19:07:45 +02:00
0xboobface 306f07cf63 Display only online models in popular models tab 2018-10-24 18:00:10 +02:00
0xboobface b6a31a258e On error write a log of the recent received strings
When the websocket message parser throws an exception,
write a logfile with the 100 last recent strings, so
that we can debug, what happened.
2018-10-24 16:46:30 +02:00
0xboobface 45c17cfaa4 Implement live preview for MFC 2018-10-24 15:47:56 +02:00
0xboobface 5cb900fe55 Add a few comments to MFC data structures 2018-10-24 15:46:06 +02:00
0xboobface f553ca3db5 Add online / offline selector on MFC Friends tab 2018-10-24 15:00:09 +02:00
0xboobface 617954928e Rename FollowedTab to ChaturbateFollowedTab 2018-10-24 14:59:48 +02:00
0xboobface a8ca3068ed Add tab "Most Popular" to MyFreeCams 2018-10-24 14:02:41 +02:00
0xboobface 1b1472540f Change affiliate links to match the correct program 2018-10-23 17:14:31 +02:00
0xboobface f4842fcf51 Improve MyFreeCamsClient
- Add watch dog to reestablish a broken connection
- Implemented creation of stream urls properly
- Add HD tab to display MFC HD streams
2018-10-23 14:02:20 +02:00
0xboobface 0f39aa6fc0 Add SiteTab class, which contains the tabs and a header
The header can contains things like, the token label
2018-10-22 18:21:47 +02:00
0xboobface 1ba003fe56 Add default constructor, so that deserialization works 2018-10-22 17:25:57 +02:00
0xboobface 8c45c45055 Fix model loading 2018-10-22 16:07:52 +02:00
0xboobface 34d43fc637 Remove unused OnlineModelsTab 2018-10-22 14:04:39 +02:00
0xboobface 330e8701e0 Add tipping for MyFreeCams 2018-10-22 14:01:22 +02:00
0xboobface 7a5abfcbcc Add description and tags to MyFreeCamsModel 2018-10-21 19:39:34 +02:00
0xboobface 387661cfdf Abstract more stuff in the site packages 2018-10-21 19:06:01 +02:00
0xboobface 362d90b29b First implementation for MFC
Implemented Tabs are Online and Friends
2018-10-19 23:09:11 +02:00
0xboobface 54de1339fb Add interfaces to abstract from camsite
This step should enable the application to handle different camsites.
At the moment only chaturbate is available, but others like MFC can
now be added. There might be still some things to do, like the settings
and HttpClient etc. But this is the first step to support more sites
than only Chatubate.
2018-10-17 14:11:04 +02:00
0xboobface 05ce02a7e8 Move chaturbate related classes to package ctbrec.sites.chaturbate 2018-10-16 18:41:18 +02:00