Skip to content
Permalink
Browse files

Revert "Snipt -> Siftie, first pass."

This reverts commit c12e294.
  • Loading branch information
nicksergeant committed Apr 24, 2019
1 parent 1468c1c commit 6ea91c3b0e99ca36a370c420a30df65f2a7ecf16
@@ -1,4 +1,4 @@
# Siftie Snippets
# Snipt

## Running locally

@@ -31,9 +31,9 @@

## Automatic deploy to Heroku

You can click the button below to automatically deploy Siftie Snippets to Heroku.
You can click the button below to automatically deploy Snipt to Heroku.

[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/siftie/snippets)
[![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/nicksergeant/snipt)

## Manual deploy to Heroku

@@ -49,8 +49,8 @@ You can click the button below to automatically deploy Siftie Snippets to Heroku

## Updating your Heroku instance after an automatic deploy

- `git clone https://github.com/siftie/snippets`
- `cd snippets`
- `git clone https://github.com/nicksergeant/snipt`
- `cd snipt`
- `git checkout heroku`
- `heroku git:remote -a <your-instance-name>`
- `git push heroku heroku:master`
@@ -97,11 +97,11 @@ def get_user_profile_url(self):

# Otherwise, if they have blog posts, use their Snipt blog URL.
elif self.get_blog_posts():
url = "https://{}.snippets.siftie.com/".format(self.user.username)
url = 'https://{}.snipt.net/'.format(self.user.username)

# Otherwise, use their regular Snipt profile page.
else:
url = "https://snippets.siftie.com/{}/".format(self.user.username)
url = 'https://snipt.net/{}/'.format(self.user.username)

return url

@@ -18,7 +18,7 @@
<table class="table">
<thead>
<tr>
<th>Snippet</th>
<th>Snipt</th>
<th>Views</th>
<th>Favs</th>
</tr>
@@ -1,12 +1,12 @@
{
"name": "Siftie Snippets",
"name": "Snipt",
"description": "Code snippets for teams and individuals.",
"keywords": [
"snipt",
"code snippets"
],
"website": "https://snippets.siftie.com",
"repository": "https://github.com/siftie/snippets",
"website": "https://snipt.net",
"repository": "https://github.com/nicksergeant/snipt",
"logo": "https://snipt.s3.amazonaws.com/logo.png",
"success_url": "/",
"scripts": {
@@ -8,14 +8,12 @@ class BlogMiddleware:
def process_request(self, request):
request.blog_user = None

host = request.META.get("HTTP_HOST", "")
host_s = host.replace("www.", "").split(".")

if (
host != "snippets.siftie.com"
and host != "snipt.localhost"
and host != "local.snippets.siftie.com"
):
host = request.META.get('HTTP_HOST', '')
host_s = host.replace('www.', '').split('.')

if host != 'snipt.net' and \
host != 'snipt.localhost' and \
host != 'local.snipt.net':
if len(host_s) > 2:
if host_s[1] == "snipt":

@@ -76,7 +76,7 @@ <h1>
{% endif %}
<nav class="footer {% if sidebar %}with-sidebar{% endif %}">
<ul class="powered">
<li class="snipt"><a href="https://snippets.siftie.com/blogging/">Blog powered by Siftie Snippets</a></li>
<li class="snipt"><a href="https://snipt.net/blogging/">Blog powered by Snipt</a></li>
</ul>
</nav>
</aside>
@@ -1,17 +1,17 @@
<rss version="2.0" xmlns:atom="http://www.w3.org/2005/Atom">
<channel>
<atom:link href="{% if request.blog_user.profile.get_primary_blog_domain and request.blog_user.profile.blog_domain != '' %}http://{{ request.blog_user.profile.blog_domain }}/?rss{% else %}https://{{ request.blog_user.username }}.snippets.siftie.com/?rss{% endif %}" rel="self" type="application/rss+xml" />
<atom:link href="{% if request.blog_user.profile.get_primary_blog_domain and request.blog_user.profile.blog_domain != '' %}http://{{ request.blog_user.profile.blog_domain }}/?rss{% else %}https://{{ request.blog_user.username }}.snipt.net/?rss{% endif %}" rel="self" type="application/rss+xml" />
<description>{% firstof request.blog_user.profile.blog_title request.blog_user.username %}</description>
<title>{% firstof request.blog_user.profile.blog_title request.blog_user.username %}</title>
<link>{% if request.blog_user.profile.get_primary_blog_domain %}http://{{ request.blog_user.profile.blog_domain }}/?rss{% else %}https://{{ request.blog_user.username }}.snippets.siftie.com/?rss{% endif %}</link>
<link>{% if request.blog_user.profile.get_primary_blog_domain %}http://{{ request.blog_user.profile.blog_domain }}/?rss{% else %}https://{{ request.blog_user.username }}.snipt.net/?rss{% endif %}</link>
{% for snipt in snipts %}
<item>
<title>{{ snipt.title }}</title>
<link>{{ snipt.get_full_absolute_url }}</link>
<description><![CDATA[{{ snipt.stylized|safe }}]]></description>
<tags>{% for tag in snipt.tags.all %}{{ tag }}{% if not forloop.last %}, {% endif %}{% endfor %}</tags>
<pubDate>{{ snipt.created|date:"r" }}</pubDate>
<guid isPermaLink="false">siftie-snippets-com-{{ snipt.id }}</guid>
<guid isPermaLink="false">snipt-net-{{ snipt.id }}</guid>
</item>
{% endfor %}
</channel>
@@ -18,7 +18,7 @@
<label class="control-label" for="id_blog_domain">Blog domain:</label>
<div class="controls">
<input id="id_blog_domain" type="text" ng-model="user.blog_domain" maxlength="250">
<span class="help-block">Like 'snipt.nicksergeant.com' or 'nicksergeant.com' (without quotes). Set your CNAME to `snippets.siftie.com` or A-record to `96.126.110.160`. You can use multiple domains here: separate each domain with a space. The first domain will be your primary domain. All other domains will redirect to your primary domain.</span>
<span class="help-block">Like 'snipt.nicksergeant.com' or 'nicksergeant.com' (without quotes). Set your CNAME to `snipt.net` or A-record to `96.126.110.160`. You can use multiple domains here: separate each domain with a space. The first domain will be your primary domain. All other domains will redirect to your primary domain.</span>
</div>
</div>
</div>
@@ -8,29 +8,22 @@

ABSOLUTE_URL_OVERRIDES = {"auth.user": lambda u: "/%s/" % u.username}
ACCOUNT_ACTIVATION_DAYS = 0
ADMINS = (("Siftie", "team@siftie.com"),)
ALLOWED_HOSTS = ["*"]
AUTH_PROFILE_MODULE = "accounts.UserProfile"
AUTHENTICATION_BACKENDS = ("utils.backends.EmailOrUsernameModelBackend",)
ADMINS = (('Nick Sergeant', 'nick@snipt.net'),)
ALLOWED_HOSTS = ['*']
AUTH_PROFILE_MODULE = 'accounts.UserProfile'
AUTHENTICATION_BACKENDS = ('utils.backends.EmailOrUsernameModelBackend',)
BASE_PATH = os.path.dirname(__file__)
CSRF_COOKIE_SECURE = True if "USE_SSL" in os.environ else False
CORS_ORIGIN_ALLOW_ALL = True
DEBUG = True if "DEBUG" in os.environ else False
DEFAULT_FROM_EMAIL = os.environ.get("POSTMARK_EMAIL", "team@siftie.com")
EMAIL_BACKEND = "postmark.django_backend.EmailBackend"
# HAYSTACK_CONNECTIONS = {
# "default": {
# "ENGINE": "haystack.backends.whoosh_backend.WhooshEngine",
# "PATH": os.environ.get("WHOOSH_PATH", "./.whoosh_index"),
# "STORAGE": "file",
# }
# }
# HAYSTACK_SIGNAL_PROCESSOR = "haystack.signals.RealtimeSignalProcessor"
INTERNAL_IPS = ("127.0.0.1",)
LANGUAGE_CODE = "en-us"
LOGIN_REDIRECT_URL = "/login-redirect/"
LOGIN_URL = "/login/"
LOGOUT_URL = "/logout/"
DEBUG = True if 'DEBUG' in os.environ else False
DEFAULT_FROM_EMAIL = os.environ.get('POSTMARK_EMAIL', 'support@snipt.net')
EMAIL_BACKEND = 'postmark.django_backend.EmailBackend'
HAYSTACK_SIGNAL_PROCESSOR = 'haystack.signals.RealtimeSignalProcessor'
INTERNAL_IPS = ('127.0.0.1',)
LANGUAGE_CODE = 'en-us'
LOGIN_REDIRECT_URL = '/login-redirect/'
LOGIN_URL = '/login/'
LOGOUT_URL = '/logout/'
MANAGERS = ADMINS
MEDIA_ROOT = os.path.join(BASE_PATH, "media/uploads")
MEDIA_URL = "/media/uploads/"
@@ -52,7 +45,7 @@
SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
SECURE_SSL_REDIRECT = True if "USE_SSL" in os.environ else False
SEND_BROKEN_LINK_EMAILS = False
SERVER_EMAIL = os.environ.get("POSTMARK_EMAIL", "team@siftie.com")
SERVER_EMAIL = os.environ.get('POSTMARK_EMAIL', 'support@snipt.net')
SESSION_COOKIE_AGE = 15801100
SESSION_COOKIE_SECURE = True if "USE_SSL" in os.environ else False
SITE_ID = 1
@@ -65,7 +58,7 @@
STATIC_ROOT = os.path.join(BASE_PATH, "static")
STATIC_URL = "/static/"
TASTYPIE_CANNED_ERROR = """There was an error with your request. The site
developers have a record of this error, please email team@siftie.com and
developers have a record of this error, please email api@snipt.net and
we'll help you out."""

TEMPLATES = [
@@ -8,13 +8,8 @@


def get_snipts(api_key, from_username, url=None, snipts=[]):
path = (
url
or "/api/private/snipt/?limit=50&api_key={}&username={}&format=json".format(
api_key, from_username
)
)
res = requests.get("https://snippets.siftie.com" + path)
path = url or '/api/private/snipt/?limit=50&api_key={}&username={}&format=json'.format(api_key, from_username)
res = requests.get('https://snipt.net' + path)
json = res.json()

print(
@@ -34,7 +29,7 @@ def get_snipts(api_key, from_username, url=None, snipts=[]):


class Command(BaseCommand):
help = u"Import snipts from Siftie Snippets."
help = u"Import snipts from snipt.net."

def add_arguments(self, parser):
parser.add_argument("api_key", nargs="+", type=str)
@@ -83,13 +83,12 @@ def save(self, *args, **kwargs):
if self.lexer == "markdown":
self.stylized = markdown(self.code, "default")

# Snippet embeds
for match in re.findall("\[\[(\w{32})\]\]", self.stylized):
self.stylized = self.stylized.replace(
"[[" + str(match) + "]]",
"""
# Snipt embeds
for match in re.findall('\[\[(\w{32})\]\]', self.stylized):
self.stylized = self.stylized.replace('[[' + str(match) + ']]',
"""
<script type="text/javascript"
src="https://snippets.siftie.com/embed/{}/?snipt">
src="https://snipt.net/embed/{}/?snipt">
</script>
<div id="snipt-embed-{}"></div>""".format(
match, match
@@ -134,10 +133,10 @@ def save(self, *args, **kwargs):
),
)

# Parse usernames
for match in re.findall("@(\w+) ", self.stylized):
# Parse Snipt usernames
for match in re.findall('@(\w+) ', self.stylized):

# Try and get the user by username.
# Try and get the Snipt user by username.
user = get_object_or_None(User, username=match)

if user:
@@ -228,9 +227,8 @@ def get_absolute_url(self):
self.user.profile.blog_domain.split(" ")[0], self.slug
)
else:
return u"https://{}.snippets.siftie.com/{}/".format(
self.user.username.replace("_", "-"), self.slug
)
return u'https://{}.snipt.net/{}/'.format(
self.user.username.replace('_', '-'), self.slug)

if self.custom_slug:
return u"/{}/".format(self.custom_slug)
@@ -248,9 +246,8 @@ def get_full_absolute_url(self):
self.user.profile.blog_domain.split(" ")[0], self.slug
)
else:
return u"https://{}.snippets.siftie.com/{}/".format(
self.user.username, self.slug
)
return u'https://{}.snipt.net/{}/'.format(
self.user.username, self.slug)

if self.public:
return u"/{}/{}/".format(self.user.username, self.slug)
@@ -277,9 +274,9 @@ def get_download_url(self):
def get_embed_url(self):

if settings.DEBUG:
root = "http://local.snippets.siftie.com"
root = 'http://local.snipt.net'
else:
root = "https://snippets.siftie.com"
root = 'https://snipt.net'

return "{}/embed/{}/".format(root, self.key)

@@ -311,7 +308,7 @@ def is_authorized_user(self, user):


class SniptLogEntry(models.Model):
"""An individual log entry for a snippet changeset."""
"""An individual log entry for a Snipt changeset."""

user = models.ForeignKey(User, on_delete=models.CASCADE)
snipt = models.ForeignKey(Snipt, on_delete=models.CASCADE)
@@ -328,7 +325,7 @@ def snipt_name(self):


class SniptSecureView(models.Model):
"""A single view to a secure snippet."""
"""A single view to a secure snipt."""

user = models.ForeignKey(User, on_delete=models.CASCADE)
snipt = models.ForeignKey(Snipt, on_delete=models.CASCADE)
@@ -1,2 +1,2 @@
{% if 'snipt' in request.GET %}document.addEventListener('DOMContentLoaded', function() { document.getElementById('snipt-embed-{{ snipt.key }}').innerHTML = '<div class="snipt-embed" onmouseover="document.getElementById(\'snipt-flag-{{ snipt.id }}\').style.display = \'block\'; return false;" onmouseout="document.getElementById(\'snipt-flag-{{ snipt.id }}\').style.display = \'none\'; return false;" style="position: relative;">{% for line in lines %}{{ line|safe }}\n{% endfor %}<div style="background-color: #111; color: #D0D0D0; float: right; padding: 5px 10px; -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; font: 11px Arial,Sans-Serif; display: none; position: absolute; bottom: 0; right: 0;" id="snipt-flag-{{ snipt.id }}">code hosted by <a href="https://snippets.siftie.com/{{ snipt.user }}/{{ snipt.slug }}{% if not snipt.public %}?key={{ snipt.key }}{% endif %}" style="color: #0084FF; text-decoration: none;">snippets.siftie.com</a></div></div>'; });
{% else %}document.open();document.writeln('<div class="snipt-embed" onmouseover="document.getElementById(\'snipt-{{ snipt.id }}\').style.display = \'block\'; return false;" onmouseout="document.getElementById(\'snipt-{{ snipt.id }}\').style.display = \'none\'; return false;" style="position: relative;">');{% for line in lines %}document.writeln('{{ line|safe }}');{% endfor %}document.writeln('<div style="background-color: #111; color: #D0D0D0; float: right; padding: 5px 10px; -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; font: 11px Arial,Sans-Serif; display: none; position: absolute; bottom: 0; right: 0;" id="snipt-{{ snipt.id }}">code hosted by <a href="https://snippets.siftie.com/{{ snipt.user }}/{{ snipt.slug }}{% if not snipt.public %}?key={{ snipt.key }}{% endif %}" style="color: #0084FF; text-decoration: none;">snippets.siftie.com</a></div>');document.writeln('</div>');document.close();{% endif %}
{% if 'snipt' in request.GET %}document.addEventListener('DOMContentLoaded', function() { document.getElementById('snipt-embed-{{ snipt.key }}').innerHTML = '<div class="snipt-embed" onmouseover="document.getElementById(\'snipt-flag-{{ snipt.id }}\').style.display = \'block\'; return false;" onmouseout="document.getElementById(\'snipt-flag-{{ snipt.id }}\').style.display = \'none\'; return false;" style="position: relative;">{% for line in lines %}{{ line|safe }}\n{% endfor %}<div style="background-color: #111; color: #D0D0D0; float: right; padding: 5px 10px; -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; font: 11px Arial,Sans-Serif; display: none; position: absolute; bottom: 0; right: 0;" id="snipt-flag-{{ snipt.id }}">code hosted by <a href="https://snipt.net/{{ snipt.user }}/{{ snipt.slug }}{% if not snipt.public %}?key={{ snipt.key }}{% endif %}" style="color: #0084FF; text-decoration: none;">snipt.net</a></div></div>'; });
{% else %}document.open();document.writeln('<div class="snipt-embed" onmouseover="document.getElementById(\'snipt-{{ snipt.id }}\').style.display = \'block\'; return false;" onmouseout="document.getElementById(\'snipt-{{ snipt.id }}\').style.display = \'none\'; return false;" style="position: relative;">');{% for line in lines %}document.writeln('{{ line|safe }}');{% endfor %}document.writeln('<div style="background-color: #111; color: #D0D0D0; float: right; padding: 5px 10px; -moz-border-radius-topleft: 5px; -webkit-border-top-left-radius: 5px; border-top-left-radius: 5px; -moz-border-radius-bottomright: 5px; -webkit-border-bottom-right-radius: 5px; border-bottom-right-radius: 5px; font: 11px Arial,Sans-Serif; display: none; position: absolute; bottom: 0; right: 0;" id="snipt-{{ snipt.id }}">code hosted by <a href="https://snipt.net/{{ snipt.user }}/{{ snipt.slug }}{% if not snipt.public %}?key={{ snipt.key }}{% endif %}" style="color: #0084FF; text-decoration: none;">snipt.net</a></div>');document.writeln('</div>');document.close();{% endif %}
@@ -27,10 +27,10 @@
{% empty %}
<div class="empty-snipts">
{% if request.user == user and not request.user.is_active and not public %}
Welcome! Please <a target="_self" href="/account/activate/">activate your account</a> to create your first snippet.
Welcome! Please <a target="_self" href="/account/activate/">activate your account</a> to create your first snipt.
{% else %}
{% if request.user == user and request.user.is_authenticated %}
Welcome! Create your first snippet by clicking "Add Snippet" above.
Welcome! Create your first snipt by clicking "Add Snipt" above.
{% else %}
No snipts to show here. Sorry!
{% endif %}
@@ -44,10 +44,10 @@
{% empty %}
<div class="empty-snipts">
{% if request.user == user and not request.user.is_active and not public %}
Welcome! Please <a target="_self" href="/account/activate/">activate your account</a> to create your first snippet.
Welcome! Please <a target="_self" href="/account/activate/">activate your account</a> to create your first snipt.
{% else %}
{% if request.user == user and request.user.is_authenticated %}
Welcome! Create your first snippet by clicking "Add Snippet" above.
Welcome! Create your first snipt by clicking "Add Snipt" above.
{% else %}
No snipts to show here. Sorry!
{% endif %}
@@ -70,7 +70,7 @@ <h1>
Private snipts do not appear in the public listing, but are accessible via the direct URL.
</div>
<div class="info public">
Public snipts are accessible by all Siftie Snippets users and appear in the public listing.
Public snipts are accessible by all Snipt.net users and appear in the public listing.
</div>
</label>
<label class="secure">

0 comments on commit 6ea91c3

Please sign in to comment.
You can’t perform that action at this time.