Changes condenser_api_patterns.get_discussions_by_blog

hivemind/tavern/condenser_api_patterns/get_discussions_by_blog/max_limit.pat.json

@@ -2356,8 +2356,6 @@
   {
     "active_votes": [
       {
-<<<<<<< HEAD
-=======
         "percent": "100",
         "reputation": 145171381514207,
         "rshares": 375241000000,
@@ -2996,7 +2994,6 @@
   {
     "active_votes": [
       {
->>>>>>> 42befe14d4ca6eb7dc6d702c7593c176fc2f2818
         "percent": "10000",
         "reputation": 5045406568403,
         "rshares": 12089675328,
@@ -11664,61 +11661,5 @@
     "title": "Down The Line",
     "total_payout_value": "0.000 HBD",
     "url": "/photography/@funny/ad8l6-down-the-line"
-  },
-  {
-    "active_votes": [
-      {
-        "percent": "10000",
-        "reputation": 147722466499,
-        "rshares": 10745569654,
-        "voter": "gubbes"
-      },
-      {
-        "percent": "10000",
-        "reputation": 688176613733,
-        "rshares": 251412025,
-        "voter": "karenmckersie"
-      },
-      {
-        "percent": "10000",
-        "reputation": 1560565135,
-        "rshares": 98195514,
-        "voter": "anirban"
-      },
-      {
-        "percent": "10000",
-        "reputation": 0,
-        "rshares": 45355016,
-        "voter": "ecology"
-      }
-    ],
-    "author": "funny",
-    "author_reputation": 8923501480463,
-    "beneficiaries": [],
-    "body": "<p>I will admit, I was one of those kids who was not a fan of gym. You know the ones. The ones that hope the three outs pass before the ball makes it to the outfield. Come on strike-out! I like to hit the ball, but the whole catching and throwing thing was not for me. I couldn't kick in soccer and apparently you need something called co-ordination for tennis. Basketball required dribbling, so that was out and football was a time to chill on the bench. I never played rugby but I'm sure I would suck at it. Golf is a no unless it is mini. Surfing involves balance and I would sink like a stone at the first wave. Skateboarding lead to ripped pants and scrapped knees. I was not winning an olympic medal when we did our track and field events in school. Hockey, ha! I was happy if I didn't fall on my ass when I was skating. I was not bad at bowling, so that is something. The point is (if there is a point) is if you did suck at sports, you are not alone. I wanted to be on the bench with a pad and a pencil drawing. So if you are or were like me, don't sweat it, find your own ways to stay in shape, eat right and embarce your lack of strength, speed and co-ordination.</p>\n<p><img src=\"https://s32.postimg.org/m5tnws97p/baseball.jpg\" /></p>",
-    "body_length": 1245,
-    "cashout_time": "1969-12-31T23:59:59",
-    "category": "life",
-    "children": 1,
-    "created": "2016-07-26T13:20:27",
-    "curator_payout_value": "0.000 HBD",
-    "depth": 0,
-    "json_metadata": "{\"tags\":[\"life\",\"funny\",\"sports\"],\"image\":[\"https://s32.postimg.org/m5tnws97p/baseball.jpg\"]}",
-    "last_payout": "2016-08-26T14:11:42",
-    "last_update": "2016-07-26T13:20:27",
-    "max_accepted_payout": "1000000.000 HBD",
-    "net_rshares": 11140532209,
-    "parent_author": "",
-    "parent_permlink": "life",
-    "pending_payout_value": "0.000 HBD",
-    "percent_hbd": 10000,
-    "permlink": "2gakj4-don-t-hit-it-to-me-don-t-hit-to-me-don-t-hit-to-me-man-did-i-suck-at-sports",
-    "post_id": 372939,
-    "promoted": "0.000 HBD",
-    "replies": [],
-    "root_title": "Don't Hit It To Me, Don't Hit To Me, Don't Hit To Me, Man Did I Suck At Sports",
-    "title": "Don't Hit It To Me, Don't Hit To Me, Don't Hit To Me, Man Did I Suck At Sports",
-    "total_payout_value": "0.000 HBD",
-    "url": "/life/@funny/2gakj4-don-t-hit-it-to-me-don-t-hit-to-me-don-t-hit-to-me-man-did-i-suck-at-sports"
   }
 ]

hivemind/tavern/condenser_api_patterns/get_discussions_by_blog/null_limit.pat.json

@@ -2356,8 +2356,6 @@
   {
     "active_votes": [
       {
-<<<<<<< HEAD
-=======
         "percent": "100",
         "reputation": 145171381514207,
         "rshares": 375241000000,
@@ -2996,7 +2994,6 @@
   {
     "active_votes": [
       {
->>>>>>> 42befe14d4ca6eb7dc6d702c7593c176fc2f2818
         "percent": "10000",
         "reputation": 5045406568403,
         "rshares": 12089675328,
@@ -5266,67 +5263,5 @@
     "title": "How To Deal With The Feeling Of A Missed Opportunity; Don't Cry Over Dropped Ice Cream",
     "total_payout_value": "0.000 HBD",
     "url": "/money/@funny/3dsbt4-how-to-deal-with-the-feeling-of-a-missed-opportunity-don-t-cry-over-dropped-ice-cream"
-  },
-  {
-    "active_votes": [
-      {
-        "percent": "10000",
-        "reputation": 1933204465,
-        "rshares": 54738831720,
-        "voter": "sonzweil"
-      },
-      {
-        "percent": "10000",
-        "reputation": 213364405044,
-        "rshares": 537905171,
-        "voter": "jearson"
-      },
-      {
-        "percent": "10000",
-        "reputation": 61580657554,
-        "rshares": 94507255,
-        "voter": "moodledidoodledi"
-      },
-      {
-        "percent": "10000",
-        "reputation": 5963920739546,
-        "rshares": 4833316766,
-        "voter": "lgm-1"
-      },
-      {
-        "percent": "10000",
-        "reputation": 33467338593,
-        "rshares": 60354652,
-        "voter": "sijoittaja"
-      }
-    ],
-    "author": "funny",
-    "author_reputation": 8923501480463,
-    "beneficiaries": [],
-    "body": "<html>\n<p>About ten years ago, maybe five, internet dating got saddled with this idea that if you use it there was something wrong with you. &nbsp;That you were socially awkward and had trouble finding a date in real life. &nbsp;But the same things were said when you were a nerd. &nbsp;It wasn't that long ago that nerds were at the bottom of the popularity chart and now it's almost uncool if you are not one. &nbsp;Things and people change. &nbsp;So @funny is announcing that internet dating is no longer something to scoff at. &nbsp;Why do I say this? &nbsp;Well here is a list of reasons why internet dating is a legit, and sometimes better, way to meet new people. &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>You Mean You Have A Personality &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>If you meet someone at a bar or club what are you really basing your decision on. &nbsp;It's simple, you're basing it on looks and looks alone. &nbsp;I'm not going to argue how important looks are, or are are not, in a relationship but I can tell you, if you don't have anything in common, the relationship is going to suffer. &nbsp;There are cases, and this is rare, when you happen to see a tattoo of something the person likes that you like as well, but even if that is the case, basing a relationship on one common interest isn't a solid plan. &nbsp;And yes, you can argue that internet dating is shallow as well, people with hot pictures are the ones getting more messages. &nbsp;But under that picture is a bio and depending on the site, other information about the person beside how they look in a swimsuit. &nbsp;It may not be a lot but it is something. &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>Get To Know The Person First &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>So you flash a smile at a club and the person comes over. &nbsp;You try to make funny banter in their ear but they can't hear a word you're saying. &nbsp;But they think you're cute, so they smile and start to dance with you. &nbsp;Maybe you end up exchanging numbers or a kiss in the corner of the club. &nbsp;That is great, but what did you really learn about the person. &nbsp;I have had times, and yes I am embarrased to admit this, where I wasn't even sure of the woman's name when I called her. &nbsp;Needless to say that relationship didn't work out. &nbsp;But when you meet someone online you have to converse with them. &nbsp;There has to be some kind of back and forth before a meetup is agreed upon. &nbsp;For some people it a quick hey let's meet for coffee and others it may be months of late night conversations, but either way the option to really talk is presented in every case. &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>Less Pressure &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>It's easier, in a way, to be yourself on the net. &nbsp;You can tell people things about yourself that you would have trouble saying in person. &nbsp;There is no fear of what the other person will say or how they will look at you and once you are comfortable that this person likes the real you then you can decide to meet. &nbsp;And there is the added benefit of being able to end the conversation anytime without any awkwardness. &nbsp;It can take months to tell someone things about you that you can spill out online in an conversation and see how they react. &nbsp;And if the getting to know the person doesn't work out, you can send a friendly goodbye message and move on to someone else. &nbsp;No need to have to wait until the date is over as you look at the clock every five minutes. &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>I Don't Have The Time To Meet People &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>That isn't just an excuse. &nbsp;People are busy and dating takes time. &nbsp;Meeting people even takes time. &nbsp;When you go out to a club or bar, you have to get ready, get there and spend, who knows how long, trying to make eye contact, or 'bump into', someone who wants to be 'bumped into' by you. &nbsp;That is if the person even wants to be bothered to chat. &nbsp;There are people who go to clubs because they want to dance or unwind and they don't want to be bothered by some one who is looking for a date. &nbsp;Plus it gets expensive. &nbsp;There are cover charges, costs of transport, drinks. &nbsp;And if you do meet someone you can only get to know them so much in the bar, so that means going on a date, which costs more money. &nbsp;It adds up, especially when you are meeting a lot of people who are not right for you. &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>I'm Shy &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>There is nothing wrong with being shy. &nbsp;Some people need time before they are comfortable putting themselves out there. &nbsp;Who cares. &nbsp;You are worth it and you want to find someone who knows that. &nbsp;And maybe you are a bit \"weird\" by some people's standards. &nbsp;Again, who cares. &nbsp;Okay techincally this doesn't argue agianst being socially awkward. &nbsp;But if you are, so what, good for you. &nbsp;We all have our quirks. &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>Now I know there are negatives. &nbsp;There are people who are not who they say are and times when you meet someone online that you click with over the net but don't seem to gel with when you meet up in person. &nbsp;It is not perfect. &nbsp;And yeah there are benefits to meeting people in person rather than online. But that does not take away from the benefits that online dating has. &nbsp;It is an option, a very viable one, of meeting people and you, if you choose to use it, should not feel lesser for doing so. &nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p><img src=\"https://s17.postimg.org/nv066jnj3/smartphone_friends_internet_connection.jpg\" width=\"630\" height=\"380\"/></p>\n<p>(pexels.com) &nbsp;</p>\n<p>So you are starting to meet new people, now what? &nbsp;I'm not going to lie to you. &nbsp;I'm not going to tell you that all you have to do is be yourself and everyone will be interested in you. &nbsp;That phone numbers will fall at your feet and your social calender will run out of space. Cause it won't. &nbsp;In reality, being yourself probably won't attract as many dates as you possibly could get. But getting a higher number of yeses shouldn't be your goal, especially if you are looking for a long-term serious relationship. &nbsp;What you want is to find that one person, the one who is going to be there for the real you. &nbsp;That one who knows who you are on your good days and your bad and will still stick it out for you when you are at your worse. &nbsp;If you waste all your time impressing the wrong people, you might miss your chance with the right ones. &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>When I was younger and didn't know better, I had made mistakes of acting in a way that I thought the person I liked wanted me to act like. &nbsp;And I have seen times when others have done it for me. &nbsp;We have all been there. &nbsp;Maybe its something small, like you pretend to like a band that you would never listen to, or something bigger, like pretending your an outdoors person when really all you want to do is stay home on a Saturday night in your pajamas. &nbsp;And this can work at first. &nbsp;If you are good enough at understanding what the other person likes, and wants, you can give it to them. &nbsp;But how long can you do it before it becomes a chore? &nbsp;When you start to act \"differently\" because you start to voice what you really think. &nbsp;At some point the person who you are will start to surface. &nbsp;Or worse it won't and that pushed down resentment can lead to some bad moods and arguements down the line. &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</p>\n<p>So give it a try. &nbsp;You are going to meet a lot of people that you will not, in one way or another, click with. &nbsp;That is just fine. &nbsp;So is being rejected. &nbsp;It does not feel great when it happens, but it happens. &nbsp;You are no worse off then before you got rejected. &nbsp;And who knows how much time you would have wasted chasing the wrong person. &nbsp;Be smart about your time and just be yourself.</p>\n</html>",
-    "body_length": 9406,
-    "cashout_time": "2016-09-12T04:11:03",
-    "category": "dating",
-    "children": 1,
-    "created": "2016-09-05T04:11:03",
-    "curator_payout_value": "0.000 HBD",
-    "depth": 0,
-    "json_metadata": "{\"tags\":[\"dating\",\"life\"],\"users\":[\"funny\"],\"image\":[\"https://s17.postimg.org/nv066jnj3/smartphone_friends_internet_connection.jpg\"]}",
-    "last_payout": "1969-12-31T23:59:59",
-    "last_update": "2016-09-05T04:11:03",
-    "max_accepted_payout": "1000000.000 HBD",
-    "net_rshares": 60264915564,
-    "parent_author": "",
-    "parent_permlink": "dating",
-    "pending_payout_value": "0.022 HBD",
-    "percent_hbd": 10000,
-    "permlink": "2eercq-why-you-should-try-internet-dating-and-just-be-yourself",
-    "post_id": 1129949,
-    "promoted": "0.000 HBD",
-    "replies": [],
-    "root_title": "Why You Should Try Internet Dating And Just Be Yourself",
-    "title": "Why You Should Try Internet Dating And Just Be Yourself",
-    "total_payout_value": "0.000 HBD",
-    "url": "/dating/@funny/2eercq-why-you-should-try-internet-dating-and-just-be-yourself"
   }
 ]