Skip to content
This repository has been archived by the owner on Apr 9, 2021. It is now read-only.

Commit

Permalink
Merge pull request #425 from Frederikam/release/v2.0
Browse files Browse the repository at this point in the history
Release/v2.0
  • Loading branch information
freyacodes committed Dec 29, 2017
2 parents 78a63da + 6175cb0 commit 0b3c9bc
Show file tree
Hide file tree
Showing 106 changed files with 2,720 additions and 1,707 deletions.
Binary file added Branding/Event/Music-fireworks-santa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Branding/Event/Patreon-fireworks-santa.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
169 changes: 169 additions & 0 deletions Branding/html/dbl.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,169 @@
<style type="text/css">

@import url('https://fonts.googleapis.com/css?family=Fugaz+One|Lato');

.fb-lato {
font-family: 'Lato', serif;
font-size: 22px;
}

.fb-title {
font-family: 'Fugaz One', serif;
font-size: 32px !important;
}

.fb-p {
margin: 0 0 5px 0;
}

.fb-li {
font-family: 'Lato', serif;
font-size: 18px;
color: #FFFFFF;
z-index: 6;
}

.fb-li-title {
color: white;
text-align: left;
font-size: 26px !important;
margin: 8px 20% 8px 20% !important;
}

.fb-background {
background-size: cover;
position: relative;
margin: 0 -10px -20px;
padding: 0.75em;
/*width: calc(100% + 16px);*/
}

.fb-logo-bg {
background-color: #1CBFE2;
padding: 0 0 0 0;
margin: 0 0 0 0;
/*left: -8px;*/
}

.fb-features-bg {
background-color: #000000;
margin: 0 0 5px 0;
opacity: 0.8;
padding: 2px 10px 7px 10px !important;
/*left: -8px;*/
}

.fb-doublelist {
padding-top: 0 !important;
padding-left: 20px;
margin-bottom: 32px;
}

.fb-button {
background-color: rgb(51, 153, 255);
border-radius: 4px;
font-size: 16px !important;
color: white !important;
text-decoration: none !important;
padding: 4px;
margin: 8px;
transition: 0.5s;
}

.fb-button:hover {
background-color: rgb(40, 102, 179);
}

.fb-flex-center {
display: flex;
justify-content: center;
}

@media screen and (min-width: 432px) {
.fb-doublelist {
list-style: disc inside !important;
text-align: left;
columns: 2 !important;
-webkit-columns: 2 !important;
-moz-columns: 2 !important;
column-width: 300px !important;
}
}

@media screen and (max-width: 1200px) {
.fb-li-title {
margin: 8px 8% 8px 8% !important;
}
}

@media screen and (max-width: 900px) {
.fb-li {
font-size: 14px !important;
column-width: 200px !important;
position: relative;
list-style: none;
}

.fb-li-title {
margin: 4px 2px 8px 2px !important;
}

.fb-doublelist {
padding-left: 10px;
}
}
</style>
<div style="margin-top:64px"></div>
<div style="text-align: center;"><p class="fb-title fb-p">Meet FredBoat♪♪</p>
<div class="fb-background fb-logo-bg">
<img style="max-width:10em;border-radius: 100px;margin: 16px 0 16px 0;" src="https://i.imgur.com/1WOFPLy.png">
</div>
</div>
<div class="fb-background fb-features-bg">
<p class="fb-lato fb-li-title" style="margin-top: 16px">FredBoat♪♪ is one of the most popular music bots around.</p>
<p class="fb-lato fb-li-title">Features: </p>
<div class="fb-flex-center">
<ul class="fb-doublelist">
<li class="fb-li">Online 24/7</li>
<li class="fb-li">No setup required</li>
<li class="fb-li">Plays music</li>
<li class="fb-li">Minimum loss of quality</li>
<li class="fb-li">Search YouTube from the chat</li>
<li class="fb-li">Skip, pause, unpause and stop</li>
<li class="fb-li">Shuffle and repeat</li>
<li class="fb-li">Forwarding, rewinding and seeking</li>
<li class="fb-li">Persistent playlist</li>
<li class="fb-li">Constant updates</li>
</ul>
</div>

<p class="fb-lato fb-li-title">With support for: </p>
<div class="fb-flex-center">
<ul class="fb-doublelist">
<li class="fb-li">Playlists</li>
<li class="fb-li">YouTube</li>
<li class="fb-li">Soundcloud</li>
<li class="fb-li">Bandcamp</li>
<li class="fb-li">Twitch</li>
<li class="fb-li">Beam.pro</li>
<li class="fb-li">Vimeo</li>
</ul>
</div>
</div>

<!-- Space -->
<div style="height: 5vh"></div>

<div style="text-align: center;"><p class="fb-title fb-p">What are you waiting for?</p></div>

<div class="fb-flex-center">
<a href="https://goo.gl/cFs5M9" role="button" class="fb-button">Invite FredBoat</a>
</div>

<div class="fb-flex-center">
<a href="https://discord.gg/cgPFW4q" role="button" class="fb-button">Join FredBoat Hangout</a>
<a href="https://fredboat.com/docs" role="button" class="fb-button">See the Documentation</a>
</div>

<!-- Space -->
<div style="height: 20vh"></div>
5 changes: 5 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
# Submitting issues
When submitting issues please state if you are using the publicly hosted FredBoat or if you are selfhosting. If you are selfhosting please state which version you are using. You can find the version by running the `;;mstats` command.

**If your issue is about an exploit please email `frogkr@gmail.com` about it. Do not publicly disclose exploits.**

# Contributing
FredBoat is built using Gradle, so you should just be able to import the project in your favorite IDE and download all dependencies while building. Check out the [issues](https://github.com/Frederikam/FredBoat/issues) to find out what needs to be done.

Expand Down
1 change: 1 addition & 0 deletions FredBoat/.dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@
!Dockerfile
!FredBoat.jar
!config.yaml
!credentials.yaml.example
6 changes: 3 additions & 3 deletions FredBoat/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
FROM openjdk:8-jre-alpine
FROM openjdk:8-jdk-slim

ENV ENV docker

RUN mkdir /opt
RUN mkdir /opt/FredBoat
RUN mkdir -p /opt/FredBoat

COPY config.yaml /opt/FredBoat/config.yaml
COPY credentials.yaml.example /opt/FredBoat/credentials.yaml
COPY FredBoat.jar /opt/FredBoat/FredBoat.jar

EXPOSE 1356
Expand Down
45 changes: 19 additions & 26 deletions FredBoat/build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
dependencies {
classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.1'
classpath 'org.junit.platform:junit-platform-gradle-plugin:1.0.2'
}
}
plugins {
Expand All @@ -13,7 +13,7 @@ apply plugin: 'org.junit.platform.gradle.plugin'

description = 'FredBoat Discord Music Bot'
mainClassName = "fredboat.FredBoat"
version '1.1'
version '2.0'
ext {
moduleName = 'FredBoat'
}
Expand All @@ -31,53 +31,46 @@ shadowJar {

dependencies {
compile project(':Shared')
compile group: 'net.dv8tion', name: 'JDA', version: '3.3.1_300'
compile group: 'com.github.FredBoat', name: 'lavaplayer', version: '1.2.44.2-FredBoat'
compile group: 'com.github.FredBoat', name: 'jda-nas', version: '1.0.5.1-JDA'
compile group: 'net.dv8tion', name: 'JDA', version: '3.3.1_308'
compile group: 'com.sedmelluq', name: 'lavaplayer', version: '1.2.45'
compile group: 'com.sedmelluq', name: 'jda-nas', version: '1.0.6'

if (System.getenv('dev') == 'true') {
compile(group: 'lavalink', name: 'Lavalink-Client', version: '-SNAPSHOT')
} else {
//production
compile(group: 'com.github.Frederikam', name: 'Lavalink', version: '69c54a9c0efa0e364dd45e837c97ed4990ce460c') {
exclude(module: 'Lavalink-Server')
}
compile(group: 'com.github.Frederikam.Lavalink', name: 'Lavalink-Client', version: '8fa6dd5d5013cbb2eb0d35be077048022f08c0eb')
}

compile group: 'org.apache.commons', name: 'commons-text', version: '1.1'
compile group: 'commons-io', name: 'commons-io', version: '2.6'
compile group: 'commons-codec', name: 'commons-codec', version: '1.11'
compile group: 'org.apache.httpcomponents', name: 'httpclient', version: '4.5.3'
compile group: 'ch.qos.logback', name: 'logback-classic', version: '1.2.3'
compile group: 'io.sentry', name: 'sentry-logback', version: '1.6.1'
compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.9.0'
compile group: 'com.sparkjava', name: 'spark-core', version: '2.6.0'
compile group: 'io.sentry', name: 'sentry-logback', version: '1.6.3'
compile group: 'com.squareup.okhttp3', name: 'okhttp', version: '3.9.1'
compile group: 'com.sparkjava', name: 'spark-core', version: '2.7.1'
compile group: 'org.yaml', name: 'snakeyaml', version: '1.19'
compile group: 'it.unimi.dsi', name: 'fastutil', version: '8.1.0'
compile group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '3.1.0'
compile group: 'it.unimi.dsi', name: 'fastutil', version: '8.1.1'
compile group: 'com.github.spotbugs', name: 'spotbugs-annotations', version: '3.1.1'
compile group: 'io.prometheus', name: 'simpleclient', version: '0.1.0'
compile group: 'io.prometheus', name: 'simpleclient_hotspot', version: '0.1.0'
compile group: 'io.prometheus', name: 'simpleclient_logback', version: '0.1.0'
compile group: 'io.prometheus', name: 'simpleclient_hibernate', version: '0.1.0'
compile group: 'io.prometheus', name: 'simpleclient_guava', version: '0.1.0'
compile group: 'io.prometheus', name: 'simpleclient_servlet', version: '0.1.0'

compile group: 'org.hibernate', name: 'hibernate-core', version: '5.2.12.Final'
compile group: 'space.npstr.SqlSauce', name: 'sqlsauce-core', version: 'a5c9afd96d1928d9a51e799249a6eb5b08b4f473'
compile group: 'org.hibernate', name: 'hibernate-ehcache', version: '5.2.12.Final'
compile group: 'org.hibernate', name: 'hibernate-hikaricp', version: '5.2.12.Final'
compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '1.5.8.RELEASE'
compile group: 'org.springframework', name: 'spring-orm', version: '4.3.11.RELEASE'
compile group: 'org.postgresql', name: 'postgresql', version: '42.1.4'
compile group: 'org.xerial', name: 'sqlite-jdbc', version: '3.20.1'
compile group: 'com.github.gwenn', name: 'sqlite-dialect', version: '24970986d0'
compile group: 'com.jcraft', name: 'jsch', version: '0.1.54'
compile group: 'org.togglz', name: 'togglz-core', version: '2.4.1.Final'
compile group: 'com.google.guava', name: 'guava', version: '23.0'
compile group: 'org.flywaydb', name: 'flyway-core', version: '5.0.3'

compile group: 'org.togglz', name: 'togglz-core', version: '2.5.0.Final'
compile group: 'com.google.guava', name: 'guava', version: '23.5-jre'
compile group: 'com.github.vladimir-bukhtoyarov', name: 'bucket4j-core', version: '3.0.2'

//tests
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.0.1'
testRuntime group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.0.1'
testCompile group: 'org.junit.jupiter', name: 'junit-jupiter-api', version: '5.0.2'
testRuntime group: 'org.junit.jupiter', name: 'junit-jupiter-engine', version: '5.0.2'
// To avoid compiler warnings about @API annotations in JUnit code.
testCompileOnly group: 'org.apiguardian', name: 'apiguardian-api', version: '1.0.0'
}
Expand All @@ -86,7 +79,7 @@ import org.apache.tools.ant.filters.ReplaceTokens

processResources {
//inject values into app.properties
filesMatching("**/*.properties") {
filesMatching("**/app.properties") {
filter ReplaceTokens, tokens: [
"project.version" : project.version,
"project.groupId" : project.group,
Expand Down
Loading

0 comments on commit 0b3c9bc

Please sign in to comment.