Changed F/E to load gifs locally

sourishkrout · Sep 18, 2018 · 73aa189 · 73aa189
1 parent 7e9cda9
commit 73aa189
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 7 deletions.
diff --git a/lib/shortcode.json b/lib/shortcode.json
@@ -64,7 +64,6 @@
   "VoteUniversityofkansasCoolSunglasses": ":universityofkansas-cool-sunglasses-26BGG0Vj4nulivlO8:",
   "VoteFunnyGifArtistG": ":funny-gif-artist-g-u0aCCHXiIOXA9fHOEB:",
   "VoteNflSmithTrequanTreQuan": ":nfl-smith-trequan-tre-quan-OkjN1aAB7z7njXRLdr:",
-  "VoteNflBakerMayfield": ":nfl-baker-mayfield-182RV9ta1F6v1iXhHl:",
   "VoteLoveKissHeart": ":love-kiss-heart-xUOwGeHJEQ46pdsvWE:",
   "VoteStudiosoriginalsValentinesDayHappy": ":studiosoriginals-valentines-day-happy-l3q2LJoEChm4UE7FS:",
   "VoteKawaiiDumpsterFire": ":kawaii-dumpster-fire-1wXeLxuTVBZe0Ht7Zu:",

diff --git a/proto/Voting.proto b/proto/Voting.proto
@@ -75,7 +75,6 @@ service VotingService {
     rpc VoteNewGirlNewGirlJessDayNewgirl (VoteRequest) returns (VoteResponse);
     rpc VoteNext (VoteRequest) returns (VoteResponse);
     rpc VoteNfl (VoteRequest) returns (VoteResponse);
-    rpc VoteNflBakerMayfield (VoteRequest) returns (VoteResponse);
     rpc VoteNflSmithTrequanTreQuan (VoteRequest) returns (VoteResponse);
     rpc VoteOscarsAcademyAwards1997 (VoteRequest) returns (VoteResponse);
     rpc VoteOxygenmediaSideEyeNoYouDidntDeitrickHaddon (VoteRequest) returns (VoteResponse);
@@ -98,6 +97,7 @@ service VotingService {
     rpc VoteThanksThankyouOmerismos (VoteRequest) returns (VoteResponse);
     rpc VoteThebacheloretteDanceKiss (VoteRequest) returns (VoteResponse);
     rpc VoteThephizzogs (VoteRequest) returns (VoteResponse);
+    rpc VoteTheXFiles (VoteRequest) returns (VoteResponse);
     rpc VoteThisisgiphyReactionAudience (VoteRequest) returns (VoteResponse);
     rpc VoteTommywiseauFootballSuperBowl (VoteRequest) returns (VoteResponse);
     rpc VoteUniversityofkansasCoolSunglasses (VoteRequest) returns (VoteResponse);

diff --git a/services/nodevoto-gif/Gif.js b/services/nodevoto-gif/Gif.js
@@ -70,7 +70,6 @@ class Gif {
       ':universityofkansas-cool-sunglasses-26BGG0Vj4nulivlO8:',
       ':funny-gif-artist-g-u0aCCHXiIOXA9fHOEB:',
       ':nfl-smith-trequan-tre-quan-OkjN1aAB7z7njXRLdr:',
-      ':nfl-baker-mayfield-182RV9ta1F6v1iXhHl:',
       ':love-kiss-heart-xUOwGeHJEQ46pdsvWE:',
       ':studiosoriginals-valentines-day-happy-l3q2LJoEChm4UE7FS:',
       ':kawaii-dumpster-fire-1wXeLxuTVBZe0Ht7Zu:',

diff --git a/services/nodevoto-web/webapp/js/components/Vote.jsx b/services/nodevoto-web/webapp/js/components/Vote.jsx
@@ -64,7 +64,7 @@ export default class Vote extends React.Component {
 
   renderGifList(gifs) {
     return _.map(gifs, (gif, i) => {
-      let url = gif.url.replace("https://media2.giphy.com/media/", "gifs/");
+      let url = `gifs/${gif.url.substr(gif.url.indexOf(".giphy.com/media/")+17)}`;
       return (
         <div
           className="gif gif-votable"
@@ -132,7 +132,7 @@ export default class Vote extends React.Component {
         containerClass="background"
       />;
     } else {
-      let url = this.state.selectedGif.url.replace("https://media2.giphy.com/media/", "gifs/");
+      let url = `gifs/${this.state.selectedGif.url.substr(this.state.selectedGif.url.indexOf(".giphy.com/media/")+17)}`;
       let contents = (
         <div>
           <p>See how you stack up against others</p>

diff --git a/test/nodevoto-gif/Gif.test.js b/test/nodevoto-gif/Gif.test.js
@@ -37,7 +37,7 @@ describe('Gif', () => {
       expect(results).not.equal(null);
       expect(results[10].url).equal('https://media1.giphy.com/media/3o7absbD7PbTFQa0c8/100w.gif');
       expect(results[10].shortcode).equal(':spongebob-cartoon-nickelodeon-thumbs-3o7absbD7PbTFQa0c8:');
-      expect(results.length).equal(86);
+      expect(results.length).equal(85);
     });
 
     it('should have all gif from the generated code map', async() => {

diff --git a/test/nodevoto-gif/api.test.js b/test/nodevoto-gif/api.test.js
@@ -49,7 +49,7 @@ describe('api (gif)', () => {
     it('should return all gifs when ListAll is called', async() => {
       let response = await wrap(impls.ListAll)();
 
-      expect(response.list.length).equals(86);
+      expect(response.list.length).equals(85);
 
       expect(response.list[5].url).equals('https://media3.giphy.com/media/3oKIPlAKUjRpoc3duw/100w.gif');
       expect(response.list[5].shortcode).equals(':gotham-foxtv-fox-broadcasting-3oKIPlAKUjRpoc3duw:');