From 8d825a904f4d84e388a5af2c873b06b344512795 Mon Sep 17 00:00:00 2001
From: thea <ta.kupler@gmail.com>
Date: Tue, 13 Sep 2016 14:59:46 +0200
Subject: reseted index.html.haml old state

---
 app/views/home/index.html.haml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/views/home/index.html.haml b/app/views/home/index.html.haml
index 5e33e62..147cacd 100644
--- a/app/views/home/index.html.haml
+++ b/app/views/home/index.html.haml
@@ -6,4 +6,4 @@
   #push
     -# #push is used for sticky footer in bootstrap 2. remove when upgrading to bootstrap 3
 #footer
-  = render 'layouts/footer'
+  = render 'layouts/footer'
\ No newline at end of file
-- 
cgit v1.2.3


From 306b36c045cd62638db179115ed002c6ab7c5cd8 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 14:36:10 +0200
Subject: included Theas work on error-handling \o/; changed link to
 twitter-account in header; fixed erb escaping characters problem without
 letting evil code pass; setting customized image file 'Avatar_Pic.png' in
 config/custo../assets to get loaded instead of default twitter-logo

---
 app/assets/images/Avatar_Pic.png        | Bin 0 -> 4298 bytes
 app/assets/images/Twitter_Logo_Blue.png | Bin 4298 -> 0 bytes
 app/assets/stylesheets/twitter.scss     |   1 +
 app/helpers/twitter_helper.rb           |  28 ++++++++++++++++++++++++++++
 app/views/twitter/_index.html.erb       |  19 ++++++++++---------
 5 files changed, 39 insertions(+), 9 deletions(-)
 create mode 100644 app/assets/images/Avatar_Pic.png
 delete mode 100644 app/assets/images/Twitter_Logo_Blue.png

(limited to 'app')

diff --git a/app/assets/images/Avatar_Pic.png b/app/assets/images/Avatar_Pic.png
new file mode 100644
index 0000000..b5eebc8
Binary files /dev/null and b/app/assets/images/Avatar_Pic.png differ
diff --git a/app/assets/images/Twitter_Logo_Blue.png b/app/assets/images/Twitter_Logo_Blue.png
deleted file mode 100644
index b5eebc8..0000000
Binary files a/app/assets/images/Twitter_Logo_Blue.png and /dev/null differ
diff --git a/app/assets/stylesheets/twitter.scss b/app/assets/stylesheets/twitter.scss
index b2233d0..a67c044 100644
--- a/app/assets/stylesheets/twitter.scss
+++ b/app/assets/stylesheets/twitter.scss
@@ -21,6 +21,7 @@
   position: absolute;
   left: 0;
   top: 0;
+  // background-image: url(/Avatar_Pic.png);
   }
 
 .twitter_image_frame > img {
diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index f824a03..719f95e 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -23,6 +23,30 @@ module TwitterHelper
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
     twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+    if twitter_user_info[2] == nil
+      error_handling
+      twitter_user_info[3] = "The twitter-handle does not exist or the account is private. Please change it or contact your provider-admin."
+    end
+  rescue Twitter::Error::BadRequest
+    error_handling
+    twitter_user_info[3] = "The request to have the tweets shown was invalid or cannot be otherwise served."
+  rescue Twitter::Error::Unauthorized
+    error_handling
+    twitter_user_info[3] = "Please change your twitter-credentials, make sure that the twitter-account you access is public or contact your provider-admin to have the tweets shown."
+  rescue Twitter::Error::Forbidden
+    error_handling
+    twitter_user_info[3] = "The request to have the tweets shown is understood, but it has been refused or access is not allowed."
+  rescue Twitter::Error::NotAcceptable
+    error_handling
+    twitter_user_info[3] = "An invalid format is specified in the request to have the tweets shown."
+  rescue Twitter::Error::TooManyRequests
+    error_handling
+    twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to see the tweets in a couple of minutes."
+  end
+
+  def error_handling
+    twitter_user_info[2] = []
+    return twitter_user_info
   end
 
   def cached_info
@@ -43,4 +67,8 @@ module TwitterHelper
   def tweets
     cached_info[2]
   end
+
+  def error_message
+    cached_info[3]
+  end
 end
diff --git a/app/views/twitter/_index.html.erb b/app/views/twitter/_index.html.erb
index a7ebd1b..cdfff4b 100644
--- a/app/views/twitter/_index.html.erb
+++ b/app/views/twitter/_index.html.erb
@@ -3,20 +3,21 @@
 
       <div class="twitter_header">
         <div class="twitter_id">
-          <div class="twitter_image_frame"><%= image_tag("Twitter_Logo_Blue.png") %></div>
-          <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/loadtocode">@<%= twitter_handle %></a></div>
+          <div class="twitter_image_frame"><%= image_tag("Avatar_Pic.png") %></div>
+          <div class="twitter_name"><%= twitter_name%><br><a href="https://twitter.com/<%= twitter_handle %>">@<%= twitter_handle %></a></div>
         </div>
       </div>
 
       <div class="twitter_list">
-        <% tweets.each do |e| %>
-          <div class="tweet">
-            <div class="tweet_text"><%= " #{e.text}" %>
+        <%if tweets == [] then%><%= error_message %><% end %>
+          <% tweets.each do |e| %>
+            <div class="tweet">
+              <div class="tweet_text"><%= sanitize(e.text) %>
+              </div>
+              <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
+              </div>
             </div>
-            <div class="tweet_text_date">tweeted on <% t = e.created_at%> <%= t.strftime("%m/%d/%y").to_s %>
-            </div>
-          </div>
-        <% end %>
+          <% end %>
     </div>
 
     <div class="twitter_footer">
-- 
cgit v1.2.3


From 6f9c4fdab2caef90e49ca965617e767b50bcbbb2 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 15:31:52 +0200
Subject: initializer/twitter.rb file unnecessary; added change in main view
 only if twitter feature is set enabled == true

---
 app/views/home/_content.html.haml | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/views/home/_content.html.haml b/app/views/home/_content.html.haml
index 5341189..950f85e 100644
--- a/app/views/home/_content.html.haml
+++ b/app/views/home/_content.html.haml
@@ -1,4 +1,18 @@
-.col-md-8
+- if twitter_enabled == true
+  .col-md-8
+    .row
+      %h1= t(:welcome, :provider => APP_CONFIG[:domain])
+      .p=t(:welcome_message_html)
+
+    .row
+      = home_page_buttons
+
+  .col-md-1
+
+  .col-md-3
+    .row
+      = render 'twitter/index'
+- else
   .row
     %h1= t(:welcome, :provider => APP_CONFIG[:domain])
     .p=t(:welcome_message_html)
@@ -6,12 +20,6 @@
   .row
     = home_page_buttons
 
-.col-md-1
-
-.col-md-3
-  .row
-    = render 'twitter/index'
-
     - if Rails.env == 'development'
       .row
         %hr
-- 
cgit v1.2.3


From cd07bbe8d0390a8622bcde257efcb3e11038de63 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 16:05:02 +0200
Subject: Modified error messages

---
 app/helpers/twitter_helper.rb | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'app')

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 719f95e..e3b468a 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,26 +22,26 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(7)
     if twitter_user_info[2] == nil
       error_handling
-      twitter_user_info[3] = "The twitter-handle does not exist or the account is private. Please change it or contact your provider-admin."
+      twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly."
     end
   rescue Twitter::Error::BadRequest
     error_handling
-    twitter_user_info[3] = "The request to have the tweets shown was invalid or cannot be otherwise served."
+    twitter_user_info[3] = "The request to display tweets is invalid or cannot be otherwise served."
   rescue Twitter::Error::Unauthorized
     error_handling
-    twitter_user_info[3] = "Please change your twitter-credentials, make sure that the twitter-account you access is public or contact your provider-admin to have the tweets shown."
+    twitter_user_info[3] = "The account's tweets are protected and cannot be displayed. Please change the privacy settings of the corresponding account."
   rescue Twitter::Error::Forbidden
     error_handling
-    twitter_user_info[3] = "The request to have the tweets shown is understood, but it has been refused or access is not allowed."
+    twitter_user_info[3] = "The request to display tweets is understood, but it has been refused or access is not allowed."
   rescue Twitter::Error::NotAcceptable
     error_handling
-    twitter_user_info[3] = "An invalid format is specified in the request to have the tweets shown."
+    twitter_user_info[3] = "An invalid format is specified in the request to display tweets."
   rescue Twitter::Error::TooManyRequests
     error_handling
-    twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to see the tweets in a couple of minutes."
+    twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to display tweets in a couple of minutes."
   end
 
   def error_handling
-- 
cgit v1.2.3


From a771c63ff6a04f2f80b94c35538dd62ad1b0c310 Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Thu, 22 Sep 2016 16:11:12 +0200
Subject: same same but slightly different

---
 app/helpers/twitter_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index e3b468a..cf75a73 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,7 +22,7 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(7)
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
     if twitter_user_info[2] == nil
       error_handling
       twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly."
-- 
cgit v1.2.3


From 4ffa776d2c760618b17bd76a9a023f7fe762babd Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 23 Sep 2016 11:52:46 +0200
Subject: Doc updated on how to customize avatar picture in twitter feature;
 update error response messages; added 'config/customization/images' + link in
 'config/initializer/customization.rb'

---
 app/helpers/twitter_helper.rb | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

(limited to 'app')

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index cf75a73..5a9d28c 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,26 +22,32 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(10)
     if twitter_user_info[2] == nil
       error_handling
       twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly."
     end
   rescue Twitter::Error::BadRequest
     error_handling
-    twitter_user_info[3] = "The request to display tweets is invalid or cannot be otherwise served."
+    twitter_user_info[3] = "The request for displaying tweets is invalid or cannot be otherwise served."
   rescue Twitter::Error::Unauthorized
     error_handling
     twitter_user_info[3] = "The account's tweets are protected and cannot be displayed. Please change the privacy settings of the corresponding account."
   rescue Twitter::Error::Forbidden
     error_handling
-    twitter_user_info[3] = "The request to display tweets is understood, but it has been refused or access is not allowed."
+    twitter_user_info[3] = "The request for displaying tweets is understood, but it has been refused or access is not allowed."
   rescue Twitter::Error::NotAcceptable
     error_handling
-    twitter_user_info[3] = "An invalid format is specified in the request to display tweets."
+    twitter_user_info[3] = "An invalid format is specified in the request for displaying tweets."
   rescue Twitter::Error::TooManyRequests
     error_handling
     twitter_user_info[3] = "The rate-limit for accessing the tweets is reached. You should be able to display tweets in a couple of minutes."
+  rescue Twitter::Error::NotFound
+    error_handling
+    twitter_user_info[3] = "The twitter hanlde does not exist."
+  rescue Twitter::Error
+    error_handling
+    twitter_user_info[3] = "An error occured while fetching the tweets."
   end
 
   def error_handling
-- 
cgit v1.2.3


From a7ab66b0478c1845ed0fdbff7dd3c83ea804826c Mon Sep 17 00:00:00 2001
From: luca-marie <ml.kochsiek@fu-berlin.de>
Date: Fri, 23 Sep 2016 15:46:25 +0200
Subject: increase number of fetched tweets to make sure 3 most recent tweets
 without RTs and @ are displayed

---
 app/helpers/twitter_helper.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/helpers/twitter_helper.rb b/app/helpers/twitter_helper.rb
index 5a9d28c..2312ed9 100644
--- a/app/helpers/twitter_helper.rb
+++ b/app/helpers/twitter_helper.rb
@@ -22,7 +22,7 @@ module TwitterHelper
   def update_twitter_info
     twitter_user_info[0] = Time.now
     twitter_user_info[1] = twitter_client.user(twitter_handle).name
-    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(10)
+    twitter_user_info[2] = twitter_client.user_timeline(twitter_handle, {:count => 200}).select{ |tweet| tweet.text.start_with?('RT','@')==false}.take(3)
     if twitter_user_info[2] == nil
       error_handling
       twitter_user_info[3] = "The twitter handle does not exist or the account's tweets are protected. Please change the privacy settings accordingly."
-- 
cgit v1.2.3