Adding location and privacy policy

CHANGELOG.md

@@ -8,6 +8,7 @@
 * Added reference to terms of service and privacy policy on signup page.
 * When visiting signup page as logged in, user should confirm he wants to create another account in order to do it.
 * Moved user stats inside profile info.
+* Adding Privacy Policy.
 
 ## 0.5.0
 

app.py

@@ -236,6 +236,11 @@ def validate_birthday(date):
         return True
     return False
 
+def validate_website(website):
+    return re.match(r'(?:https?://)?(?:[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*'
+        r'|\[[A-Fa-f0-9:]+\])(?::\d+)?(?:/[^\s]*)?(?:\?[^\s]*)?(?:#[^\s]*)?$',
+        website)
+
 def human_short_date(timestamp):
     return ''
 
@@ -306,6 +311,25 @@ class Visibility(object):
                     yield i
                 counter += 1
 
+def get_locations():
+    data = {}
+    with open('locations.txt') as f:
+        for line in f:
+            line = line.rstrip()
+            if line.startswith('#'):
+                continue
+            try:
+                key, value = line.split(None, 1)
+            except ValueError:
+                continue
+            data[key] = value
+    return data
+
+try:
+    locations = get_locations()
+except OSError:
+    locations = {}
+
 # get the user from the session
 # changed in 0.5 to comply with flask_login
 def get_current_user():
@@ -369,7 +393,7 @@ def after_request(response):
 
 @app.context_processor
 def _inject_variables():
-    return {'site_name': app.config['SITE_NAME']}
+    return {'site_name': app.config['SITE_NAME'], 'locations': locations}
 
 @login_manager.user_loader
 def _inject_user(userid):
@@ -614,10 +638,18 @@ def edit_profile():
             username = user.username
         if username != user.username:
             User.update(username=username).where(User.id == user.id).execute()
+        website = request.form['website'].strip().replace(' ', '%20')
+        if website and not validate_website(website):
+            flash('You should enter a valid URL.')
+            return render_template('edit_profile.html')
+        location = int(request.form.get('location'))
+        if location == 0:
+            location = None
         UserProfile.update(
             full_name=request.form['full_name'] or username,
             biography=request.form['biography'],
-            website=request.form['website']
+            website=website,
+            location=location
         ).where(UserProfile.user == user).execute()
         return redirect(url_for('user_detail', username=username))
     return render_template('edit_profile.html')
@@ -677,6 +709,14 @@ def username_availability(username):
         is_available = False
     return jsonify({'is_valid':is_valid, 'is_available':is_available, 'status':'ok'})
 
+@app.route('/ajax/location_search/<name>')
+def location_search(name):
+    results = []
+    for key, value in locations.items():
+        if value.startswith(name):
+            results.append({'value': key, 'display': value})
+    return jsonify({'results': results})
+
 _enrich_symbols = [
     (r'\n', 'NEWLINE'),
     (r'https?://(?:[A-Za-z0-9-]+(?:\.[A-Za-z0-9-]+)*|\[[A-Fa-f0-9:]+\])'
@@ -720,6 +760,10 @@ def enrich(s):
 def is_following(from_user, to_user):
     return from_user.is_following(to_user)
 
+@app.template_filter('locationdata')
+def locationdata(key):
+    if key > 0:
+        return locations[str(key)]
 
 # allow running from the command line
 if __name__ == '__main__':

locations.txt

@@ -0,0 +1,356 @@
+004 	Afghanistan
+008 	Albania
+010 	Antarctica
+012 	Algeria
+016 	American Samoa
+020 	Andorra
+024 	Angola
+028 	Antigua and Barbuda
+031 	Azerbaijan
+032 	Argentina
+036 	Australia
+040 	Austria
+044 	Bahamas
+048 	Bahrain
+050 	Bangladesh
+051 	Armenia
+052 	Barbados
+056 	Belgium
+060 	Bermuda
+064 	Bhutan
+068 	Bolivia (Plurinational State of)
+070 	Bosnia and Herzegovina
+072 	Botswana
+074 	Bouvet Island
+076 	Brazil
+084 	Belize
+086 	British Indian Ocean Territory
+090 	Solomon Islands
+092 	Virgin Islands (British)
+096 	Brunei Darussalam
+100 	Bulgaria
+104 	Myanmar
+108 	Burundi
+112 	Belarus
+116 	Cambodia
+120 	Cameroon
+124 	Canada
+132 	Cabo Verde
+136 	Cayman Islands
+140 	Central African Republic
+144 	Sri Lanka
+148 	Chad
+152 	Chile
+156 	China
+158 	Taiwan, Province of China
+162 	Christmas Island
+166 	Cocos (Keeling) Islands
+170 	Colombia
+174 	Comoros
+175 	Mayotte
+178 	Congo
+180 	Congo, Democratic Republic of the
+184 	Cook Islands
+188 	Costa Rica
+191 	Croatia
+192 	Cuba
+196 	Cyprus
+203 	Czechia
+204 	Benin
+208 	Denmark
+212 	Dominica
+214 	Dominican Republic
+218 	Ecuador
+222 	El Salvador
+226 	Equatorial Guinea
+231 	Ethiopia
+232 	Eritrea
+233 	Estonia
+234 	Faroe Islands
+238 	Falkland Islands (Malvinas)
+239 	South Georgia and the South Sandwich Islands
+242 	Fiji
+246 	Finland
+248 	Åland Islands
+250 	France
+254 	French Guiana
+258 	French Polynesia
+260 	French Southern Territories
+262 	Djibouti
+266 	Gabon
+268 	Georgia
+270 	Gambia
+275 	Palestine, State of
+276 	Germany
+288 	Ghana
+292 	Gibraltar
+296 	Kiribati
+300 	Greece
+304 	Greenland
+308 	Grenada
+312 	Guadeloupe
+316 	Guam
+320 	Guatemala
+324 	Guinea
+328 	Guyana
+332 	Haiti
+334 	Heard Island and McDonald Islands
+336 	Holy See
+340 	Honduras
+344 	Hong Kong
+348 	Hungary
+352 	Iceland
+356 	India
+360 	Indonesia
+364 	Iran (Islamic Republic of)
+368 	Iraq
+372 	Ireland
+376 	Israel
+380 	Italy
+384 	Côte d'Ivoire
+388 	Jamaica
+392 	Japan
+398 	Kazakhstan
+400 	Jordan
+404 	Kenya
+408 	Korea (Democratic People's Republic of)
+410 	Korea, Republic of
+414 	Kuwait
+417 	Kyrgyzstan
+418 	Lao People's Democratic Republic
+422 	Lebanon
+426 	Lesotho
+428 	Latvia
+430 	Liberia
+434 	Libya
+438 	Liechtenstein
+440 	Lithuania
+442 	Luxembourg
+446 	Macao
+450 	Madagascar
+454 	Malawi
+458 	Malaysia
+462 	Maldives
+466 	Mali
+470 	Malta
+474 	Martinique
+478 	Mauritania
+480 	Mauritius
+484 	Mexico
+492 	Monaco
+496 	Mongolia
+498 	Moldova, Republic of
+499 	Montenegro
+500 	Montserrat
+504 	Morocco
+508 	Mozambique
+512 	Oman
+516 	Namibia
+520 	Nauru
+524 	Nepal
+528 	Netherlands
+531 	Curaçao
+533 	Aruba
+534 	Sint Maarten (Dutch part)
+535 	Bonaire, Sint Eustatius and Saba
+540 	New Caledonia
+548 	Vanuatu
+554 	New Zealand
+558 	Nicaragua
+562 	Niger
+566 	Nigeria
+570 	Niue
+574 	Norfolk Island
+578 	Norway
+580 	Northern Mariana Islands
+581 	United States Minor Outlying Islands
+583 	Micronesia (Federated States of)
+584 	Marshall Islands
+585 	Palau
+586 	Pakistan
+591 	Panama
+598 	Papua New Guinea
+600 	Paraguay
+604 	Peru
+608 	Philippines
+612 	Pitcairn
+616 	Poland
+620 	Portugal
+624 	Guinea-Bissau
+626 	Timor-Leste
+630 	Puerto Rico
+634 	Qatar
+638 	Réunion
+642 	Romania
+643 	Russian Federation
+646 	Rwanda
+652 	Saint Barthélemy
+654 	Saint Helena, Ascension and Tristan da Cunha
+659 	Saint Kitts and Nevis
+660 	Anguilla
+662 	Saint Lucia
+663 	Saint Martin (French part)
+666 	Saint Pierre and Miquelon
+670 	Saint Vincent and the Grenadines
+674 	San Marino
+678 	Sao Tome and Principe
+682 	Saudi Arabia
+686 	Senegal
+688 	Serbia
+690 	Seychelles
+694 	Sierra Leone
+702 	Singapore
+703 	Slovakia
+704 	Viet Nam
+705 	Slovenia
+706 	Somalia
+710 	South Africa
+716 	Zimbabwe
+724 	Spain
+728 	South Sudan
+729 	Sudan
+732 	Western Sahara
+740 	Suriname
+744 	Svalbard and Jan Mayen
+748 	Eswatini
+752 	Sweden
+756 	Switzerland
+760 	Syrian Arab Republic
+762 	Tajikistan
+764 	Thailand
+768 	Togo
+772 	Tokelau
+776 	Tonga
+780 	Trinidad and Tobago
+784 	United Arab Emirates
+788 	Tunisia
+792 	Turkey
+795 	Turkmenistan
+796 	Turks and Caicos Islands
+798 	Tuvalu
+800 	Uganda
+804 	Ukraine
+807 	North Macedonia
+818 	Egypt
+826 	United Kingdom of Great Britain and Northern Ireland
+831 	Guernsey
+832 	Jersey
+833 	Isle of Man
+834 	Tanzania, United Republic of
+840 	United States of America
+850 	Virgin Islands (U.S.)
+854 	Burkina Faso
+858 	Uruguay
+860 	Uzbekistan
+862 	Venezuela (Bolivarian Republic of)
+876 	Wallis and Futuna
+882 	Samoa
+887 	Yemen
+894 	Zambia
+1001    Torino
+1002    Vercelli
+1003    Novara
+1004    Cuneo
+1005    Asti
+1006    Alessandria
+1007    Aosta
+1008    Imperia
+1009    Savona
+1010    Genova
+1011    La Spezia
+1012    Varese
+1013    Como
+1014    Sondrio
+1015    Milano
+1016    Bergamo
+1017    Brescia
+1018    Pavia
+1019    Cremona
+1020    Mantova
+1021    Bolzano
+1022    Trento
+1023    Verona
+1024    Vicenza
+1025    Belluno
+1026    Treviso
+1027    Venezia
+1028    Padova
+1029    Rovigo
+1030    Udine
+1031    Gorizia
+1032    Trieste
+1033    Piacenza
+1034    Parma
+1035    Reggio nell'Emilia
+1036    Modena
+1037    Bologna
+1038    Ferrara
+1039    Ravenna
+1040    Forlì-Cesena
+1041    Pesaro e Urbino
+1042    Ancona
+1043    Macerata
+1044    Ascoli Piceno
+1045    Massa-Carrara
+1046    Lucca
+1047    Pistoia
+1048    Firenze
+1049    Livorno
+1050    Pisa
+1051    Arezzo
+1052    Siena
+1053    Grosseto
+1054    Perugia
+1055    Terni
+1056    Viterbo
+1057    Rieti
+1058    Roma
+1059    Latina
+1060    Frosinone
+1061    Caserta
+1062    Benevento
+1063    Napoli
+1064    Avellino
+1065    Salerno
+1066    L'Aquila
+1067    Teramo
+1068    Pescara
+1069    Chieti
+1070    Campobasso
+1071    Foggia
+1072    Bari
+1073    Taranto
+1074    Brindisi
+1075    Lecce
+1076    Potenza
+1077    Matera
+1078    Cosenza
+1079    Catanzaro
+1080    Reggio Calabria
+1081    Trapani
+1082    Palermo
+1083    Messina
+1084    Agrigento
+1085    Caltanissetta
+1086    Enna
+1087    Catania
+1088    Ragusa
+1089    Siracusa
+1090    Sassari
+1091    Nuoro
+1092    Cagliari
+1093    Pordenone
+1094    Isernia
+1095    Oristano
+1096    Biella
+1097    Lecco
+1098    Lodi
+1099    Rimini
+1100    Prato
+1101    Crotone
+1102    Vibo Valentia
+1103    Verbano-Cusio-Ossola
+1108    Monza e della Brianza
+1109    Fermo
+1110    Barletta-Andria-Trani
+1111    Sud Sardegna

templates/edit_profile.html

@@ -12,6 +12,8 @@
     <dd><input type="text" name="full_name" value="{{ profile.full_name }}"></dd>
     <dt>Biography:</dt>
     <dd><textarea class="biography_text" name="biography">{{ profile.biography }}</textarea></dd>
+    <dt>Location:</dt>
+    <dd>{% include "includes/location_selector.html" %}</dd>
     <dt>Website:</dt>
     <dd><input type="text" name="website" value="{{ profile.website }}"></dd>
     <dd><input type="submit" value="Save"></dd>

templates/includes/infobox_profile.html

@@ -3,12 +3,14 @@
   <h3>{{ profile.full_name }}</h3>
   <p>{{ profile.biography|enrich }}</p>
   {% if profile.location %}
-    <p><span class="weak">Location:</span> {{ profile.location }}</p>
+    <p><span class="weak">Location:</span> {{ profile.location|locationdata }}</p>
   {% endif %}
   {% if profile.year %}
     <p><span class="weak">Year:</span> {{ profile.year }}</p>
   {% endif %}
   {% if profile.website %}
+    {% set website = profile.website %}
+    {% set website = website if website.startswith(('http://', 'https://')) else 'http://' + website %}
     <p><span class="weak">Website:</span> {{ profile.website|urlize }}</p>
   {% endif %}
   {% if profile.instagram %}

templates/includes/location_selector.html

@@ -0,0 +1,6 @@
+<select name="location">
+  <option value="0">Not Applicable</option>
+  {% for k, v in locations.items() %}
+  <option value="{{ k }}">{{ v }}</option>
+  {% endfor %}
+</select>

templates/privacy.html

@@ -3,5 +3,45 @@
 {% block body %}
 <h1>Privacy Policy</h1>
 
+<p>At {{ site_name }}, accessible from {{ request.host }}, one of our main priorities is the privacy of our visitors. This Privacy Policy document contains types of information that is collected and recorded by {{ site_name }} and how we use it.</p>
 
+<p>If you have additional questions or require more information about our Privacy Policy, do not hesitate to contact us through email at sakuragasaki46@gmail.com</p>
+
+<h2>Log Files</h2>
+
+<p>{{ site_name }} follows a standard procedure of using log files. These files log visitors when they visit websites. All hosting companies do this and a part of hosting services' analytics. The information collected by log files include internet protocol (IP) addresses, browser type, Internet Service Provider (ISP), date and time stamp, referring/exit pages, and possibly the number of clicks. These are not linked to any information that is personally identifiable. The purpose of the information is for analyzing trends, administering the site, tracking users' movement on the website, and gathering demographic information.</p>
+
+<h2>Cookies and Web Beacons</h2>
+
+<p>Like any other website, {{ site_name }} uses 'cookies'. These cookies are used to store information including visitors' preferences, and the pages on the website that the visitor accessed or visited. The information is used to optimize the users' experience by customizing our web page content based on visitors' browser type and/or other information.</p>
+
+
+
+<h2>Privacy Policies</h2>
+
+<P>You may consult this list to find the Privacy Policy for each of the advertising partners of {{ site_name }}. Our Privacy Policy was created with the help of the <a href="https://www.privacypolicygenerator.info">Privacy Policy Generator</a> and the <a href="https://www.generateprivacypolicy.com">Generate Privacy Policy Generator</a>.</p>
+
+<p>Third-party ad servers or ad networks uses technologies like cookies, JavaScript, or Web Beacons that are used in their respective advertisements and links that appear on {{ site_name }}, which are sent directly to users' browser. They automatically receive your IP address when this occurs. These technologies are used to measure the effectiveness of their advertising campaigns and/or to personalize the advertising content that you see on websites that you visit.</p>
+
+<p>Note that {{ site_name }} has no access to or control over these cookies that are used by third-party advertisers.</p>
+
+<h2>Third Party Privacy Policies</h2>
+
+<p>{{ site_name }}'s Privacy Policy does not apply to other advertisers or websites. Thus, we are advising you to consult the respective Privacy Policies of these third-party ad servers for more detailed information. It may include their practices and instructions about how to opt-out of certain options. You may find a complete list of these Privacy Policies and their links here: Privacy Policy Links.</p>
+
+<p>You can choose to disable cookies through your individual browser options. To know more detailed information about cookie management with specific web browsers, it can be found at the browsers' respective websites. What Are Cookies?</p>
+
+<h2>Children's Information</h2>
+
+<p>Another part of our priority is adding protection for children while using the internet. We encourage parents and guardians to observe, participate in, and/or monitor and guide their online activity.</p>
+
+<p>{{ site_name }} does not knowingly collect any Personal Identifiable Information from children under the age of 13. If you think that your child provided this kind of information on our website, we strongly encourage you to contact us immediately and we will do our best efforts to promptly remove such information from our records.</p>
+
+<h2>Online Privacy Policy Only</h2>
+
+<p>This Privacy Policy applies only to our online activities and is valid for visitors to our website with regards to the information that they shared and/or collect in {{ site_name }}. This policy is not applicable to any information collected offline or via channels other than this website.</p>
+
+<h2>Consent</h2>
+
+<p>By using our website, you hereby consent to our Privacy Policy and agree to its Terms and Conditions.</p>
 {% endblock %}