From 34e0492c22d16dbc9081d2bb345262dac370ab43 Mon Sep 17 00:00:00 2001
From: YanwenLin <ll1124278064@gmail.com>
Date: Wed, 18 Apr 2018 15:15:23 -0400
Subject: [PATCH] The function to get hashtags and mentions only returns the
 "#" or "@". The reason is that in the returned tweet, there is a space
 between content of hash and tag "#"(same as mentions). Hence the regex
 "(#\\w*)" does not work. Here it is changed to "r'(#\s\w*)'". This works now.

---
 .DS_Store                   | Bin 0 -> 6148 bytes
 got/.DS_Store               | Bin 0 -> 6148 bytes
 got/manager/TweetManager.py |   4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 .DS_Store
 create mode 100644 got/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..f51fcc866cbe968835b6961bd8e252bec443115a
GIT binary patch
literal 6148
zcmeHK&2G~`5S~p8u_=fgD%ztjNF1W7p^czIl}wr(A^}1e!2wWe6RWZ0*uil~O9;w^
zcL3giN8!Yg2jKzW+aE&h6pj&8JJReo-kq6^zwGRKiHJ4Fy*g2qh)gI);}V)PgpYGw
zl9KAV3}hllN*M)|(iRPuymg0WKr`^KF~DngjoNgKicL_tzw7s;6D2SGDDmOJw};Qr
z8$X1=BD#i3&qsBskG=?*x+2dp+AS!skn2t%SDB75d%=rsobBaLMnm<xzWBo^9A(?v
z-&m<^T)0><Ez7j7STEduGI2968;_b^`iwt4^s>IM?8iwGEo{$!5(blQb^RcTGcSyT
zR0M~;04~p;hH)>MG?Q`M8;Lxw91s(AtDDp5&Amp=uJ7*5YW8&R_HNB?+-l5bmbr1g
zzTY_<oV=O7oxS_W8N)7#ZBocpg}>kv3`N3gH;tntK0*)oHY7E)lc$iq$Jpt=W8rsR
z=~=vBfuIWAqYfQl4L=~4+69`v7ig-`eex)zSe#LXHD2-x-WEMV-n-O7R2vZk>gDs7
zz7`^?sG)#f(HL`ZYXFT=1EarG!iQ5;g>)+uwHVE{mCdLp(hO(@{uc)L{$N8nItu3!
z#nypFTmgUvx`n{z9}7IjR_G|4OT-9-$xxsSW$KE-WH|b5<>x4zOO)Zn)a8SznVGtw
zFflvw+rpigBT=`S0nI?3fwFw8^7Fs_=lg#?NIz)?Gy~^~0cNz^RuiwJ&eo-u<7cf6
sJ%n=MeshT;1dTe5g~5;FO{frz+1vm+3g;5h1JNG>f(G4a23E?zPr0!D?f?J)

literal 0
HcmV?d00001

diff --git a/got/.DS_Store b/got/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..2b6aa245f48acc5138c066814443681b0a1d91db
GIT binary patch
literal 6148
zcmeHK!EO^V5FMv!yQ>P315$hR1&Kq18fXMng|rIg&>PYsH~>m_*{EG<yN<FOq7s7k
zH{cKW6uyAZfj73Png+NP0h(Ej-*`M@%g>g*CL%SMW<8<~5d~1jR*2#!!tJap((;~l
zpt61BRMQaOT^g@Mi{o!(fY)xzu31hcU0%QQqr$vN3zH&(x5okW&NnNth&Jhr667Rw
zLL-`7iT?ci=yX<%ecxZwagkT`?(SFBT5GRwYzAQ%gg3(1@u```by82OK{9#CwWmpa
zntJ=0F~x<Qq|fuwY}mQ=*pzjWm!pYI&a)9hUcJc6%*+O6T4t5)Cw2{XpkZfcKEJo$
z@9N&({Y6*L_aE+cb^k$su?U0h+r39e$7kp7=I<9DKH6!M!dAC()8h~L1mg-RZ{tZ>
znDPWIoV5YU3}v9JplX>gwT<@6^r9*v3<v|lz;!X;53*qEx(1Mbg#lsUpJjm02MuM6
zJT?yP(SgD~0f23|t-$7=Mb6P4Bae+kv_O<g1-ew_pBT!e!>@f@<gsz+(n<Nphw>vU
z|3XoAbo8%nIH|~?l)`{8u*|@kt9JPQfAZ`1|8kPlgaKjTzhXeO597lDrsVI|mC5m4
ttD(nG7LIEiUZlXVS21GwD&B!wfnT!$j660D;ep7HfTckSVc?H4@Et+9clrPT

literal 0
HcmV?d00001

diff --git a/got/manager/TweetManager.py b/got/manager/TweetManager.py
index 63d29dd1..8e9ea25b 100644
--- a/got/manager/TweetManager.py
+++ b/got/manager/TweetManager.py
@@ -58,8 +58,8 @@ def getTweets(tweetCriteria, receiveBuffer=None, bufferLength=100, proxy=None):
 				tweet.date = datetime.datetime.fromtimestamp(dateSec)
 				tweet.retweets = retweets
 				tweet.favorites = favorites
-				tweet.mentions = " ".join(re.compile('(@\\w*)').findall(tweet.text))
-				tweet.hashtags = " ".join(re.compile('(#\\w*)').findall(tweet.text))
+				tweet.mentions = " ".join(re.compile(r'(@\s\w*)').findall(tweet.text))
+				tweet.hashtags = " ".join(re.compile(r'(#\s\w*)').findall(tweet.text))
 				tweet.geo = geo
 				
 				results.append(tweet)