davebluke
/
ctbrec
forked from j62/ctbrec
1
0
Fork 0
Code Pull Requests Activity

Implement tipping for CamSoda 

Sending tips for CamSoda works now
This commit is contained in:
0xboobface 2018-11-02 18:14:36 +01:00
parent cbc4a5e339
commit 233dd3fa9c
2 changed files with 60 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/java/ctbrec/sites/camsoda/Camsoda.java
View File

@ -65,11 +65,11 @@ public class Camsoda extends AbstractSite {
@Override @Override
public Integer getTokenBalance() throws IOException { public Integer getTokenBalance() throws IOException {
String username = Config.getInstance().getSettings().camsodaUsername; if (!credentialsAvailable()) {
if (username == null || username.trim().isEmpty()) { throw new IOException("Account settings not available");
throw new IOException("Not logged in");
} }
String username = Config.getInstance().getSettings().camsodaUsername;
String url = BASE_URI + "/api/v1/user/" + username; String url = BASE_URI + "/api/v1/user/" + username;
Request request = new Request.Builder().url(url).build(); Request request = new Request.Builder().url(url).build();
Response response = getHttpClient().execute(request, true); Response response = getHttpClient().execute(request, true);
@ -113,12 +113,14 @@ public class Camsoda extends AbstractSite {
@Override @Override
public void shutdown() { public void shutdown() {
if(httpClient != null) {
httpClient.shutdown(); httpClient.shutdown();
} }
}
@Override @Override
public boolean supportsTips() { public boolean supportsTips() {
return false; return true;
} }
@Override @Override

67
src/main/java/ctbrec/sites/camsoda/CamsodaModel.java
View File

@ -6,11 +6,14 @@ import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Objects; import java.util.Objects;
import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutionException;
import java.util.concurrent.TimeUnit;
import org.json.JSONObject; import org.json.JSONObject;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.google.common.cache.Cache;
import com.google.common.cache.CacheBuilder;
import com.iheartradio.m3u8.Encoding; import com.iheartradio.m3u8.Encoding;
import com.iheartradio.m3u8.Format; import com.iheartradio.m3u8.Format;
import com.iheartradio.m3u8.ParseException; import com.iheartradio.m3u8.ParseException;
@ -24,6 +27,7 @@ import com.iheartradio.m3u8.data.StreamInfo;
import ctbrec.AbstractModel; import ctbrec.AbstractModel;
import ctbrec.recorder.download.StreamSource; import ctbrec.recorder.download.StreamSource;
import ctbrec.sites.Site; import ctbrec.sites.Site;
import okhttp3.FormBody;
import okhttp3.Request; import okhttp3.Request;
import okhttp3.RequestBody; import okhttp3.RequestBody;
import okhttp3.Response; import okhttp3.Response;
@ -34,10 +38,15 @@ public class CamsodaModel extends AbstractModel {
private String streamUrl; private String streamUrl;
private Site site; private Site site;
private List<StreamSource> streamSources = null; private List<StreamSource> streamSources = null;
private int[] resolution;
private String status = "n/a"; private String status = "n/a";
private float sortOrder = 0; private float sortOrder = 0;
private static Cache<String, int[]> streamResolutionCache = CacheBuilder.newBuilder()
.initialCapacity(10_000)
.maximumSize(10_000)
.expireAfterWrite(30, TimeUnit.MINUTES)
.build();
public String getStreamUrl() throws IOException { public String getStreamUrl() throws IOException {
if(streamUrl == null) { if(streamUrl == null) {
// load model // load model
@ -95,7 +104,10 @@ public class CamsodaModel extends AbstractModel {
@Override @Override
public List<StreamSource> getStreamSources() throws IOException, ExecutionException, ParseException, PlaylistException { public List<StreamSource> getStreamSources() throws IOException, ExecutionException, ParseException, PlaylistException {
LOG.debug("Loading master playlist {}", streamUrl); String streamUrl = getStreamUrl();
if(streamUrl == null) {
return Collections.emptyList();
}
Request req = new Request.Builder().url(streamUrl).build(); Request req = new Request.Builder().url(streamUrl).build();
Response response = site.getHttpClient().execute(req); Response response = site.getHttpClient().execute(req);
try { try {
@ -126,11 +138,12 @@ public class CamsodaModel extends AbstractModel {
@Override @Override
public void invalidateCacheEntries() { public void invalidateCacheEntries() {
streamSources = null; streamSources = null;
resolution = null; streamResolutionCache.invalidate(getName());
} }
@Override @Override
public int[] getStreamResolution(boolean failFast) throws ExecutionException { public int[] getStreamResolution(boolean failFast) throws ExecutionException {
int[] resolution = streamResolutionCache.getIfPresent(getName());
if(resolution != null) { if(resolution != null) {
return resolution; return resolution;
} else { } else {
@ -139,9 +152,14 @@ public class CamsodaModel extends AbstractModel {
} else { } else {
try { try {
List<StreamSource> streamSources = getStreamSources(); List<StreamSource> streamSources = getStreamSources();
if(streamSources.isEmpty()) {
return new int[] {0,0};
} else {
StreamSource src = streamSources.get(0); StreamSource src = streamSources.get(0);
resolution = new int[] {src.width, src.height}; resolution = new int[] {src.width, src.height};
streamResolutionCache.put(getName(), resolution);
return resolution; return resolution;
}
} catch (IOException | ParseException | PlaylistException e) { } catch (IOException | ParseException | PlaylistException e) {
throw new ExecutionException(e); throw new ExecutionException(e);
} }
@ -151,22 +169,29 @@ public class CamsodaModel extends AbstractModel {
@Override @Override
public void receiveTip(int tokens) throws IOException { public void receiveTip(int tokens) throws IOException {
// TODO Auto-generated method stub String csrfToken = ((CamsodaHttpClient)site.getHttpClient()).getCsrfToken();
/* String url = site.getBaseUrl() + "/api/v1/tip/" + getName();
sendTip: function(i, a, r, o, c, d) { if (!Objects.equals(System.getenv("CTBREC_DEV"), "1")) {
if (!s.isAuthenticated()) return s.showRegister(), t.when(!1); LOG.debug("Sending tip {}", url);
var u = t.defer(); RequestBody body = new FormBody.Builder()
return e.post("/api/v1/tip/" + i, { .add("amount", Integer.toString(tokens))
amount: a, .add("comment", "")
comment: o, .build();
type: r, Request request = new Request.Builder()
app_data: c, .url(url)
source_id: d .post(body)
}).then(function(e) { .addHeader("Referer", Camsoda.BASE_URI + '/' + getName())
1 == e.data.status ? (s.currentUser.tokens = e.data.total, void 0 != e.data.tipped_performer_last_24hrs && e.data.tipped_performer_last_24hrs >= 25 && (n.$emit("local.allowed_to_rate"), 0 == n.allowedToRate && (n.allowedToRate = !0, l.pop("info", "Voting Unlocked", "You tipped " + i + " 25 tokens in the past 24 hours, you may now vote!"))), u.resolve(e.data)) : (l.pop("error", e.data.error, e.data.message), u.reject(e.data)) .addHeader("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:62.0) Gecko/20100101 Firefox/62.0")
}), u.promise .addHeader("Accept", "application/json, text/plain, */*")
}, .addHeader("Accept-Language", "en")
*/ .addHeader("X-CSRF-Token", csrfToken)
.build();
try(Response response = site.getHttpClient().execute(request, true)) {
if(!response.isSuccessful()) {
throw new IOException("HTTP status " + response.code() + " " + response.message());
}
}
}
} }
@Override @Override
@ -180,7 +205,7 @@ public class CamsodaModel extends AbstractModel {
.addHeader("Referer", Camsoda.BASE_URI + '/' + getName()) .addHeader("Referer", Camsoda.BASE_URI + '/' + getName())
.addHeader("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:62.0) Gecko/20100101 Firefox/62.0") .addHeader("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:62.0) Gecko/20100101 Firefox/62.0")
.addHeader("Accept", "application/json, text/plain, */*") .addHeader("Accept", "application/json, text/plain, */*")
.addHeader("Accept-Language", " de,en-US;q=0.7,en;q=0.3") .addHeader("Accept-Language", "en")
.addHeader("X-CSRF-Token", csrfToken) .addHeader("X-CSRF-Token", csrfToken)
.build(); .build();
Response resp = site.getHttpClient().execute(request, true); Response resp = site.getHttpClient().execute(request, true);
@ -204,7 +229,7 @@ public class CamsodaModel extends AbstractModel {
.addHeader("Referer", Camsoda.BASE_URI + '/' + getName()) .addHeader("Referer", Camsoda.BASE_URI + '/' + getName())
.addHeader("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:62.0) Gecko/20100101 Firefox/62.0") .addHeader("User-Agent", "Mozilla/5.0 (X11; Linux x86_64; rv:62.0) Gecko/20100101 Firefox/62.0")
.addHeader("Accept", "application/json, text/plain, */*") .addHeader("Accept", "application/json, text/plain, */*")
.addHeader("Accept-Language", " de,en-US;q=0.7,en;q=0.3") .addHeader("Accept-Language", "en")
.addHeader("X-CSRF-Token", csrfToken) .addHeader("X-CSRF-Token", csrfToken)
.build(); .build();
Response resp = site.getHttpClient().execute(request, true); Response resp = site.getHttpClient().execute(request, true);